diff options
| author | Jeff King <peff@peff.net> | 2017-02-27 04:25:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-02 11:04:57 -0800 |
| commit | 13228c30a6476456ee64eb7cefb7786d82fd2ca7 (patch) | |
| tree | c829818e460604eb58cce62a44e38265b693db0e /sha1_name.c | |
| parent | 3b9e3c2cede15057af3ff8076c45ad5f33829436 (diff) | |
| download | git-13228c30a6476456ee64eb7cefb7786d82fd2ca7.tar.gz | |
interpret_branch_name(): handle auto-namelen for @{-1}
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>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index 73a915ff1b..9b5d14b4bf 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1263,11 +1263,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) { |