Re: Elegant subdirectory checkout of remote-tracking branch?

2013-03-02 Thread Jeff King
On Fri, Mar 01, 2013 at 10:22:53AM -0500, W. Trevor King wrote: > These fail because I can't use a remote tracking branch as a > source for the clone. It should be possible to do: > > $ git clone --reference . --single-branch --branch todo > git://git.kernel.org/pub/scm/git/git.git Meta > >

Re: [bug report] git-am applying maildir patches in reverse

2013-03-02 Thread Andreas Schwab
Jeff King writes: > static int maildir_filename_cmp(const char *a, const char *b) > { > - while (1) { > + while (*a && *b) { > if (isdigit(*a) && isdigit(*b)) { > long int na, nb; > na = strtol(a, (char **)&a, 10); > @@ -148,6 +1

[PATCH] Avoid loading commits twice in log with diffs

2013-03-02 Thread Thomas Rast
If you run a log with diffs (such as -p, --raw, --stat etc.) the current code ends up loading many objects twice. For example, for 'log -3000 -p' my instrumentation said the objects loaded more than once are distributed as follows: 2008 blob 2103 commit 2678 tree Fixing blobs and trees wil

Re: Debugging a bizarre problem: What can influence 'git fetch'?

2013-03-02 Thread Tay Ray Chuan
On Fri, Mar 1, 2013 at 10:39 PM, wrote: > Is there some way to get 'git fetch' > to be more verbose? It seems that the remote is running the 'dumb' http protocol, you might want to try setting the GIT_CURL_VERBOSE environment variable for more verbosity. Have you tried running git-update-server

Re: Subtree in Git

2013-03-02 Thread David Michael Barr
On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell wrote: > On Fri, Mar 1, 2013 at 2:28 AM, Kindjal wrote: >> David Michael Barr rr-dav.id.au> writes: >> >>> From a quick survey, it appears there are no more than 55 patches >>> squashed into the submitted patch. >>> As I have an interest in git-subtr

[PATCH] Revert "graph.c: mark private file-scope symbols as static"

2013-03-02 Thread John Keeping
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb. CGit uses these symbols to output the correct HTML around graph elements. Making these symbols private means that CGit cannot be updated to use Git 1.8.0 or newer, so let's not do that. Signed-off-by: John Keeping --- I realise that

Re: Debugging a bizarre problem: What can influence 'git fetch'?

2013-03-02 Thread git-users
On Sat, 2 Mar 2013 18:32:17 +0800 Tay Ray Chuan wrote: > > It seems that the remote is running the 'dumb' http protocol, you > might want to try setting the GIT_CURL_VERBOSE environment variable > for more verbosity. > > Have you tried running git-update-server-info on the remote side? > Perhaps

[PATCH] tests: make sure rename pretty print works

2013-03-02 Thread Antoine Pelisse
Add basic use cases and corner cases tests for "git diff -M --summary/stat". Signed-off-by: Antoine Pelisse --- t/t4056-rename-pretty.sh | 54 ++ 1 file changed, 54 insertions(+) create mode 100755 t/t4056-rename-pretty.sh diff --git a/t/t4056-rena

Re: [PATCH] Revert "graph.c: mark private file-scope symbols as static"

2013-03-02 Thread Johan Herland
On Sat, Mar 2, 2013 at 1:46 PM, John Keeping wrote: > This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb. > > CGit uses these symbols to output the correct HTML around graph > elements. Making these symbols private means that CGit cannot be > updated to use Git 1.8.0 or newer, so let's

[PATCH] Allow combined diff to ignore white-spaces

2013-03-02 Thread Antoine Pelisse
Currently, it's not possible to use the space-ignoring options (-b, -w, --ignore-space-at-eol) with combined diff. It makes it pretty impossible to read a merge between a branch that changed all tabs to spaces, and a branch with functional changes. Pass diff flags to diff engine, so that combined

Re: Subtree in Git

2013-03-02 Thread Paul Campbell
On Sat, Mar 2, 2013 at 11:21 AM, David Michael Barr wrote: > On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell wrote: >> On Fri, Mar 1, 2013 at 2:28 AM, Kindjal wrote: >>> David Michael Barr rr-dav.id.au> writes: >>> From a quick survey, it appears there are no more than 55 patches squash

Re: [PATCH] Revert "graph.c: mark private file-scope symbols as static"

2013-03-02 Thread Thomas Rast
John Keeping writes: > This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb. > > CGit uses these symbols to output the correct HTML around graph > elements. Making these symbols private means that CGit cannot be > updated to use Git 1.8.0 or newer, so let's not do that. > > Signed-off-by

[PATCH] submodule update: when using recursion, show full path

2013-03-02 Thread William Entriken
Previously when using update with recursion, only the path for the inner-most module was printed. Now the path is printed relative to the directory the command was started from. This now matches the behavior of submodule foreach. Signed-off-by: William Entriken --- git-submodule.sh | 31

Re: [bug report] git-am applying maildir patches in reverse

2013-03-02 Thread Junio C Hamano
Andreas Schwab writes: > You should always cast to unsigned char when determining the order of > characters, to be consistent with strcmp/memcmp. We treat runs of digits as numbers, so it is not even similar to strcmp. As long as it is internally consistent (i.e. the return value inside the loo

Re: [bug report] git-am applying maildir patches in reverse

2013-03-02 Thread Jeff King
On Sat, Mar 02, 2013 at 09:44:39AM +0100, Andreas Schwab wrote: > > + return *a - *b; > > You should always cast to unsigned char when determining the order of > characters, to be consistent with strcmp/memcmp. Thanks, I hadn't heard that advice before, but it makes obvious sense. Junio, do yo

Re: [PATCH] Make !pattern in .gitattributes non-fatal

2013-03-02 Thread Junio C Hamano
Duy Nguyen writes: > This "return NULL;" means we ignore "!blah" pattern, which is a > regression, isn't it? Should we treat '!' as literal here? Probably not. Can you point to a project everybody has heard of that keeps track of a path that begins with an exclamation point? With clarification

Re: [bug report] git-am applying maildir patches in reverse

2013-03-02 Thread Jeff King
On Sat, Mar 02, 2013 at 10:22:46PM -0800, Junio C Hamano wrote: > Andreas Schwab writes: > > > You should always cast to unsigned char when determining the order of > > characters, to be consistent with strcmp/memcmp. > > We treat runs of digits as numbers, so it is not even similar to > strcmp

Re: [PATCH] tests: make sure rename pretty print works

2013-03-02 Thread Junio C Hamano
Antoine Pelisse writes: > Add basic use cases and corner cases tests for > "git diff -M --summary/stat". > > Signed-off-by: Antoine Pelisse > --- > t/t4056-rename-pretty.sh | 54 > ++ > 1 file changed, 54 insertions(+) > create mode 100755 t/t4056

Re: [PATCH] Avoid loading commits twice in log with diffs

2013-03-02 Thread Junio C Hamano
Thomas Rast writes: > Test with patchbefore > > 4000.2: log --raw -3000 0.50(0.43+0.06) 0.54(0.46+0.06) +7.0%*** > 4000.3: log -p -3000 2.34(2.20+0.13) 2.37(2.22+0.13) +1.2% >

Re: [PATCH] Allow combined diff to ignore white-spaces

2013-03-02 Thread Junio C Hamano
Antoine Pelisse writes: > Currently, it's not possible to use the space-ignoring options (-b, -w, > --ignore-space-at-eol) with combined diff. It makes it pretty impossible > to read a merge between a branch that changed all tabs to spaces, and a > branch with functional changes. > > Pass diff fl