Re: (Ab)using filter-branch from a post-receive hook

2012-07-14 Thread Junio C Hamano
Wincent Colaiuta writes: > On Jul 14, 2012, at 10:25 PM, Junio C Hamano wrote: > >> I did not see anything wrong doing what you described in the >> post-receive, even though having the hook in the "scratch" felt >> strange, as the "copying from authoritative" would also want to be >> automated an

Re: (Ab)using filter-branch from a post-receive hook

2012-07-14 Thread Wincent Colaiuta
On Jul 14, 2012, at 10:25 PM, Junio C Hamano wrote: > Wincent Colaiuta writes: > >> Specifically, I was thinking of doing the following: >> >> - on pushing into our authoritative repo, we replicate to a second >> "scratch" repo where all the dirty work gets done >> >> - the scratch repo has a

Re: [PATCH] doc: A few minor copy edits.

2012-07-14 Thread Junio C Hamano
Štěpán Němec writes: > - (glossary) the quotes around the Wikipedia URL prevented its > linkification in frontends that support it; remove them > > - (manual) newer version (SHA-1) == following, older == preceding, not > the other way around > > - trivial typo and wording fixes > > Signed-off

Re: (Ab)using filter-branch from a post-receive hook

2012-07-14 Thread Junio C Hamano
Wincent Colaiuta writes: > At $day_job we want to start publishing a subtree of our codebase as > open source. As we audit and prep more sections of the code base, > we'll be broadening the subtree(s) that we export, until eventually we > want as close as possible to the whole thing to be open so

(Ab)using filter-branch from a post-receive hook

2012-07-14 Thread Wincent Colaiuta
Hi, At $day_job we want to start publishing a subtree of our codebase as open source. As we audit and prep more sections of the code base, we'll be broadening the subtree(s) that we export, until eventually we want as close as possible to the whole thing to be open source. The resulting public

Re: [RFC] Add a new email notification script to "contrib"

2012-07-14 Thread Michael Haggerty
On 07/14/2012 11:46 AM, Stefan Näwe wrote: From: Michael Haggerty alum.mit.edu> Add a new Python script, contrib/hooks/post-receive-multimail.py, that can be used to send notification emails describing pushes into a git repository. This script is derived from contrib/hooks/post-receive-mail, b

Re: bzr->git: keep empty directories

2012-07-14 Thread Steven Michalske
Perhaps having a file named something like: .git_foreign_scm_empty_dir or some shorter name. With the contents of the fast importer empty directory info put in there; If any book keeping is needed. It also looks like you strip out meta-data. perhaps a file like: .git_foreign_scm_metadata We

Re: bzr->git: keep empty directories

2012-07-14 Thread David Aguilar
On Sat, Jul 14, 2012 at 7:41 AM, Felix Natter wrote: > hello, > > when converting a repo from bzr to git: > > mkdir freeplane-git1 > cd freeplane-git1 > git init . > bzr fast-export --plain --export-marks=../marks.bzr ../trunk/ | git > fast-import --export-marks=../marks.git > git checkout > > Em

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Zeeshan Ali (Khattak)
On Sun, Jul 15, 2012 at 12:26 AM, Junio C Hamano wrote: > "Zeeshan Ali (Khattak)" writes: > >> What about '^' and '^^' that I suggested? >> While I see your "~" much distasteful compared to "^", you still >>> >>> s/dist/less dist/; sorry ;-) >> >> Why? > > That "^^" is the most important rea

[PATCH] doc: A few minor copy edits.

2012-07-14 Thread Štěpán Němec
- (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec --- Documentation/

[PATCH] block-sha1: put macro arguments in parentheses

2012-07-14 Thread Jonathan Nieder
't' is currently always a numeric constant, but it can't hurt to prepare for the day that it becomes useful for a caller to pass in a more complex expression. Suggested-by: Linus Torvalds Signed-off-by: Jonathan Nieder --- block-sha1/sha1.c |4 ++-- 1 file changed, 2 insertions(+), 2 deleti

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Junio C Hamano
"Zeeshan Ali (Khattak)" writes: > What about '^' and '^^' that I suggested? > >>> While I see your "~" much distasteful compared to "^", you still >> >> s/dist/less dist/; sorry ;-) > > Why? That "^^" is the most important reason why your "^ is the same as HEAD^" is flawed, and goes against my t

Re: [PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-14 Thread Linus Torvalds
Looks good to me. I'd suggest doing the macro argument expansion in #define SHA_SRC(t) get_be32((unsigned char *) block + t*4) with parenthesis around 't', but that's a fairly independent thing. The old code didn't do that either. Linus -- To unsubscribe from this list: send the lin

[PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-14 Thread Jonathan Nieder
With 660231aa (block-sha1: support for architectures with memory alignment restrictions, 2009-08-12), blk_SHA1_Update was modified to access 32-bit chunks of memory one byte at a time on arches that prefer that: #define get_be32(p)( \ (*((unsigned char *)(p) + 0) << 24)

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Zeeshan Ali (Khattak)
On Sat, Jul 14, 2012 at 11:34 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Näwe writes: >> >>> Zeeshan Ali (Khattak gnome.org> writes: Many times I want to refer to 'HEAD^', 'HEAD^^' and sometimes even further up the tree. It would be really nice if I didn't hav

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Näwe writes: > >> Zeeshan Ali (Khattak gnome.org> writes: >>> >>> Many times I want to refer to 'HEAD^', 'HEAD^^' and sometimes even >>> further up the tree. It would be really nice if I didn't have to type >>> 'HEAD^' but could only type '^'. Bash completion ma

Re: [PATCH] status: default in-progress color to header color

2012-07-14 Thread Junio C Hamano
Jeff King writes: > But given that this is not even configurable in the current code, I > really wonder if it needs to have its own color at all. Do people really > want to set the color of this message separately? Maybe we should just > use WT_STATUS_HEADER instead. I would prefer that myself,

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Junio C Hamano
Stefan Näwe writes: > Zeeshan Ali (Khattak gnome.org> writes: >> >> Many times I want to refer to 'HEAD^', 'HEAD^^' and sometimes even >> further up the tree. It would be really nice if I didn't have to type >> 'HEAD^' but could only type '^'. Bash completion make things easier >> but it automa

Re: What's cooking in git.git (Jul 2012, #04; Fri, 13)

2012-07-14 Thread Junio C Hamano
Alexander Strasser writes: > As the whole series is not that important I think it should be OK to > wait a little longer, isn't it? I thought the series queued in 'pu' was more or less done from my point of view, but wanted to know if you wanted to polish it further, as I prefer waiting for pe

Re: [PATCH maint-1.6.5] block-sha1: avoid unaligned accesses on some big-endian systems

2012-07-14 Thread Linus Torvalds
On Sat, Jul 14, 2012 at 12:50 PM, Jonathan Nieder wrote: > After the patch, what reason does gcc have to expect that 'block' is > 32-bit aligned except when it is? The code (including the code I > didn't touch) never casts from char * to int * except in get/put_be32 > on arches that don't mind un

Re: [PATCH maint-1.6.5] block-sha1: avoid unaligned accesses on some big-endian systems

2012-07-14 Thread Jonathan Nieder
Linus Torvalds wrote: > On Sat, Jul 14, 2012 at 12:59 AM, Jonathan Nieder wrote: >> Unfortunately, on big-endian architectures, if p is a pointer to >> unsigned int then current gcc assumes it is properly aligned and >> converts this construct to a 32-bit load. > > This patch seems to entirely de

Re: [PATCH maint-1.6.5] block-sha1: avoid unaligned accesses on some big-endian systems

2012-07-14 Thread Linus Torvalds
On Sat, Jul 14, 2012 at 12:59 AM, Jonathan Nieder wrote: > > Unfortunately, on big-endian architectures, if p is a pointer to > unsigned int then current gcc assumes it is properly aligned and > converts this construct to a 32-bit load. This patch seems to entirely depend on the location of the c

Re: [PATCH] t3910: give reason for skipping the test

2012-07-14 Thread Torsten Bögershausen
On 14.07.12 19:52, Michael J Gruber wrote: > t3910 is skipped for most users because it requires a filesystem which > does automatic conversion between different utf-8 types. Currently, this > results in a skipped test with "no reason given". > > Use the skip_all mechanism from our test suite so t

[PATCH] t3910: give reason for skipping the test

2012-07-14 Thread Michael J Gruber
t3910 is skipped for most users because it requires a filesystem which does automatic conversion between different utf-8 types. Currently, this results in a skipped test with "no reason given". Use the skip_all mechanism from our test suite so that a reason for skipping the test is given to the us

bzr->git: keep empty directories

2012-07-14 Thread Felix Natter
hello, when converting a repo from bzr to git: mkdir freeplane-git1 cd freeplane-git1 git init . bzr fast-export --plain --export-marks=../marks.bzr ../trunk/ | git fast-import --export-marks=../marks.git git checkout Empty directories are not contained in the git working index. This is because

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-14 Thread Felix Natter
Andreas Schwab writes: > Jeff King writes: > >> On Fri, Jul 13, 2012 at 11:04:21AM +0200, Andreas Schwab wrote: >> >>> > If you run only the bzr half of your command and inspect the output, you >>> > will see that the file in question is mentioned twice. Once in a commit >>> > on "refs/heads/ma

Re: What's cooking in git.git (Jul 2012, #04; Fri, 13)

2012-07-14 Thread Alexander Strasser
Hi, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with '-' are > only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. [...] > [New Topics] > > * as/t4012-style-updates (2012-07-12) 7 commits > - t4012: use 'printf' instead of 'dd'

Re: [PATCH 1/3] git p4: remove unused P4Submit interactive setting

2012-07-14 Thread Pete Wyckoff
p...@padd.com wrote on Thu, 05 Jul 2012 08:30 -0400: > l...@diamand.org wrote on Thu, 05 Jul 2012 08:20 +0100: > > On 04/07/12 14:34, Pete Wyckoff wrote: > > >The code is unused. Delete. > > > > I've used that non-interactive code path in the past, in the very > > early days of using it (setting

Re: [PATCH] status: default in-progress color to header color

2012-07-14 Thread Jeff King
On Sat, Jul 14, 2012 at 08:28:28AM -0400, Jeff King wrote: > My intent was that this would also let "color.status.inprogress" > override it, in case a user really wanted a green message or something. > However, I notice that the original series did not add such a config > option, so this color can

[PATCH] status: default in-progress color to header color

2012-07-14 Thread Jeff King
The "status" command recently learned to describe the in-progress operation in its long output format (e.g., rebasing, am, etc). The color for this message defaults to "normal" (i.e., no color). However, if the user has set their default header color to something besides normal, then the message st

t1450-fsck (sometimes/often) failes on Mac OS X

2012-07-14 Thread Torsten Bögershausen
I saw the problem first on pu, some time ago, but it dissappeared after cloning git.git into another directory. Now it appeared on next as well, so it's time to look a little bit deeper. This test case of t1450 fails: test_expect_success 'tag pointing to something else than its type' ' To debug

Re: [RFC] Add a new email notification script to "contrib"

2012-07-14 Thread Stefan Naewe
On Sat, Jul 14, 2012 at 12:37 PM, Tay Ray Chuan wrote: > Hi Stefan, > > On Sat, Jul 14, 2012 at 5:46 PM, Stefan Näwe wrote: >> >> Do you have a fork of git.git somewhere that contains the script? >> (I find it so much easier these days to simply fetch another repo instead >> of applying patches w

Re: Support of '^' as alias for 'HEAD^'

2012-07-14 Thread Stefan Näwe
Zeeshan Ali (Khattak gnome.org> writes: > > Hi, > Many times I want to refer to 'HEAD^', 'HEAD^^' and sometimes even > further up the tree. It would be really nice if I didn't have to type > 'HEAD^' but could only type '^'. Bash completion make things easier > but it automatically inserts a sp

Re: [RFC] Add a new email notification script to "contrib"

2012-07-14 Thread Stefan Näwe
alum.mit.edu> writes: > > From: Michael Haggerty alum.mit.edu> > > Add a new Python script, contrib/hooks/post-receive-multimail.py, that > can be used to send notification emails describing pushes into a git > repository. This script is derived from > contrib/hooks/post-receive-mail, but ha

Re: [PATCH] revision: avoid work after --max-count is reached

2012-07-14 Thread Jeff King
On Fri, Jul 13, 2012 at 03:12:47PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Yeah, this was my analysis, too. Though reading get_revision-1, it seems > > like we can actually set SHOWN, but I wasn't able to trigger any change > > of behavior in practice. I think it is because we mus

[PATCH maint-1.6.5] block-sha1: avoid unaligned accesses on some big-endian systems

2012-07-14 Thread Jonathan Nieder
With 660231aa (block-sha1: support for architectures with memory alignment restrictions, 2009-08-12), blk_SHA1_Update was modified to work reasonably on RISC-y architectures by accessing 32-bit values one byte at a time on machines that prefer that: #define get_unaligned_be32(p)( \