[PATCH] git-log: added --none-match option

2015-01-03 Thread Christoph Junghans
Implements a inverted match for "git log", like in the case of "git grep -v", which is useful from time to time to e.g. filter FIXUP message out of "git log". Internally, a new bol 'none_match' has been introduces as revs->grep_filter.invert inverts the match line-wise, which cannot work as i.e. e

git stash fails on symlinked directory

2015-01-03 Thread Joó Ádám
Hello, I’ve just run into this issue described earlier elsewhere: * http://permalink.gmane.org/gmane.comp.version-control.git/241909 * https://groups.google.com/forum/#!topic/git-users/hbhf7-QTbFM Is this a bug (it certainly seems like one to me). Is this something developers are aware of? Tha

RFC: web UI for commit dependency inference tool

2015-01-03 Thread Adam Spiers
Hi all, Thanks to my employer's generous "Hack Week" policy[0], I have the luxury of being able to spend most of next week hacking on a git commit dependency inference tool which I built 14 months ago but never got round to polishing up or publically announcing. In this email I'll briefly explain

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-03 Thread Jeff King
On Sat, Jan 03, 2015 at 05:45:09PM +, brian m. carlson wrote: > >+{ > >+int flags = CURLAUTH_ANY; > > I think this needs to be unsigned long or it can cause undefined behavior, > since libcurl uses unsigned long in the flags. I'll fix that up when I > reroll. I'll need your

Re: [PATCH v3] for-each-ref: Always check stat_tracking_info()'s return value.

2015-01-03 Thread Raphael Kubo da Costa
Jeff King writes: > I think you could minimize this quite a bit as: > > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh > index cba3454..f259c22 100755 > --- a/t/t6300-for-each-ref.sh > +++ b/t/t6300-for-each-ref.sh > @@ -340,12 +340,11 @@ cat >expected < EOF > > test_expect_su

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-03 Thread brian m. carlson
On Sat, Jan 03, 2015 at 06:19:23AM -0500, Jeff King wrote: This pattern gets repeated in several places. Now that http_passwordless_auth is a global, can we handle it automatically for the callers, as below (which, aside from compiling, is completely untested by me)? This looks good (although I

Re: [PATCH v3] for-each-ref: Always check stat_tracking_info()'s return value.

2015-01-03 Thread Jeff King
On Fri, Jan 02, 2015 at 11:01:53PM +0200, Raphael Kubo da Costa wrote: > In this case, num_ours and num_theirs had undefined values and a call to > `git for-each-ref --format="%(upstream:track)"` could print spurious > values such as > > [behind -111794512] > [ahead 38881640, behind 5103867]

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-03 Thread Jeff King
On Thu, Jan 01, 2015 at 07:56:27PM +, brian m. carlson wrote: > +void disable_passwordless_auth(struct active_request_slot *slot) > +{ > +#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY > +#define HTTP_AUTH_PASSWORDLESS (CURLAUTH_GSSNEGOTIATE) > + curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, > +

Re: [PATCHv9 1/9] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-03 Thread Duy Nguyen
On Sat, Jan 3, 2015 at 9:20 AM, Jonathan Nieder wrote: >> - if (shallow_update && !checked_connectivity) >> - error("BUG: run 'git fsck' for safety.\n" >> - "If there are errors, try to remove " >> - "the reported refs above"); >> + if (shall

[PATCH 2/3] checkout: add --ignore-other-wortrees

2015-01-03 Thread Nguyễn Thái Ngọc Duy
Noticed-by: Mark Levedahl Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 6 ++ builtin/checkout.c | 6 +- t/t2025-checkout-to.sh | 7 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Docu

[PATCH 3/3] git-checkout.txt: a note about multiple checkout support for submodules

2015-01-03 Thread Nguyễn Thái Ngọc Duy
The goal seems to be using multiple checkouts to reduce disk space. But we have not reached an agreement how things should be. There are a couple options. - You may want to keep $SUB repos elsewhere (perhaps in a central place) outside $SUPER. This is also true for nested submodules where a

[PATCH 1/3] checkout: pass whole struct to parse_branchname_arg instead of individual flags

2015-01-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 953b763..d8717ef 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1079,11 +1079,12 @@ static void

[PATCH 0/3] nd/multiple-work-trees updates

2015-01-03 Thread Nguyễn Thái Ngọc Duy
These patches are on top of what's in 'pu'. They add --ignore-other-worktrees and make a note about current submodule support status. I don't think submodule support is ready yet even with Max Kirillov's series [1]. His 03/03 is already fixed in 'pu' though, so only 01/03 and 02/03 are new. [1] ht