diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-05-15 14:32:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-16 12:53:59 -0700 |
commit | 84cf246670eab56a23ed5554ed084053a0f19f2d (patch) | |
tree | fd5ec6b225cd139eb0e8132dbb3cf1981d7ee271 /t/t9151/svn-mergeinfo.dump | |
parent | remote-bzr: update old organization (diff) | |
download | tgif-84cf246670eab56a23ed5554ed084053a0f19f2d.tar.xz |
strbuf_branchname(): do not double-expand @{-1}~22
If you were on 'frotz' branch before you checked out your current
branch, "git merge @{-1}~22" means the same as "git merge frotz~22".
The strbuf_branchname() function, when interpret_branch_name() gives
up resolving "@{-1}~22" fully, returns "frotz" and tells the caller
that it only resolved "@{-1}" part of the input, mistakes this as a
total failure, and appends the whole thing to the result, yielding
"frotz@{-1}~22", which does not make any sense.
Inspect the return value from interpret_branch_name() a bit more
carefully. When it errored out without consuming anything, we will
get -1 and we should return the whole thing. Otherwise, we should
append the remainder (i.e. "~22" in the earlier example) to the
partially resolved name (i.e. "frotz").
The test suite adds enough number of checkout to make @{-12} in the
last test in t0100 that tried to check "we haven't flipped branches
that many times" error case succeed; raise the number to a hundred.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9151/svn-mergeinfo.dump')
0 files changed, 0 insertions, 0 deletions