From d46a8301930ae83de30fbbbbce1bb02a98745204 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 28 Jan 2010 04:52:22 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- t/t1508-at-combinations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/t1508-at-combinations.sh') diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index 59f04636f..2a46af24d 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -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}" -- cgit v1.2.1