• Junio C Hamano's avatar
    strbuf_branchname(): do not double-expand @{-1}~22 · 84cf2466
    Junio C Hamano authored
    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: default avatarJunio C Hamano <gitster@pobox.com>
t0100-previous.sh 1.42 KB