fix parsing of @{-1}@{u} combination

Previously interpret_branch_name would see @{-1} and stop
parsing, leaving the @{u} as cruft that provoked an error.
Instead, we should recurse if there is more to parse.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2010-01-28 04:52:22 -05:00
committed by Junio C Hamano
parent 42cab601cf
commit d46a830193
2 changed files with 24 additions and 4 deletions

View File

@ -43,8 +43,8 @@ check "@{-1}" old-two
check "@{-1}@{1}" old-one
check "@{u}" upstream-two
check "@{u}@{1}" upstream-one
fail check "@{-1}@{u}" master-two
fail check "@{-1}@{u}@{1}" master-one
check "@{-1}@{u}" master-two
check "@{-1}@{u}@{1}" master-one
fail nonsense "@{u}@{-1}"
nonsense "@{1}@{u}"