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 but

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

2013-03-02 Thread Andreas Schwab
Jeff King p...@peff.net 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

[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

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, git-us...@io7m.com 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

Re: Subtree in Git

2013-03-02 Thread David Michael Barr
On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell pcampb...@kemitix.net wrote: On Fri, Mar 1, 2013 at 2:28 AM, Kindjal kind...@gmail.com wrote: David Michael Barr b at 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

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 rcta...@gmail.com 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

[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 apeli...@gmail.com --- t/t4056-rename-pretty.sh | 54 ++ 1 file changed, 54 insertions(+) create mode 100755 t/t4056-rename-pretty.sh diff

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 j...@keeping.me.uk 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

[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 b...@rr-dav.id.au wrote: On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell pcampb...@kemitix.net wrote: On Fri, Mar 1, 2013 at 2:28 AM, Kindjal kind...@gmail.com wrote: David Michael Barr b at rr-dav.id.au writes: From a quick survey, it appears

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

2013-03-02 Thread Thomas Rast
John Keeping j...@keeping.me.uk 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.

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

2013-03-02 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org 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

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 you

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

2013-03-02 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com 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

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 sch...@linux-m68k.org 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

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

2013-03-02 Thread Junio C Hamano
Thomas Rast tr...@student.ethz.ch 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)

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

2013-03-02 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com 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.