diff options
| author | Jeff King <peff@peff.net> | 2017-02-27 04:25:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 11:26:26 -0800 |
| commit | 426f765950461f9c94cdf7dad8878b2d7058b7d9 (patch) | |
| tree | cf3c2f2a58a03441870c1257b689fb41c91c2313 | |
| parent | c3808ca6982b0ad7ee9b87eca9b50b9a24ec08b0 (diff) | |
| download | git-jk/auto-namelen-in-interpret-branch-name.tar.gz | |
interpret_branch_name(): handle auto-namelen for @{-1}jk/auto-namelen-in-interpret-branch-name
The interpret_branch_name() function takes a ptr/len pair
for the name, but you can pass "0" for "namelen", which will
cause it to check the length with strlen().
However, before we do that auto-namelen magic, we call
interpret_nth_prior_checkout(), which gets fed the bogus
"0". This was broken by 8cd4249c4 (interpret_branch_name:
always respect "namelen" parameter, 2014-01-15). Though to
be fair to that commit, it was broken in the _opposite_
direction before, where we would always treat "name" as a
string even if a length was passed.
You can see the bug with "git log -g @{-1}". That code path
always passes "0", and without this patch it cannot figure
out which branch's reflog to show.
We can fix it by a small reordering of the code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 3 | ||||
| -rwxr-xr-x | t/t0100-previous.sh | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index ca7ddd6f2c..3948aeddd9 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1146,11 +1146,12 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) { char *at; const char *start; - int len = interpret_nth_prior_checkout(name, namelen, buf); + int len; if (!namelen) namelen = strlen(name); + len = interpret_nth_prior_checkout(name, namelen, buf); if (!len) { return len; /* syntax Ok, not enough switches */ } else if (len > 0) { diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh index e0a6940232..58c0b7e9b6 100755 --- a/t/t0100-previous.sh +++ b/t/t0100-previous.sh @@ -56,5 +56,13 @@ test_expect_success 'merge @{-100} before checking out that many branches yet' ' test_must_fail git merge @{-100} ' +test_expect_success 'log -g @{-1}' ' + git checkout -b last_branch && + git checkout -b new_branch && + echo "last_branch@{0}" >expect && + git log -g --format=%gd @{-1} >actual && + test_cmp expect actual +' + test_done |