summaryrefslogtreecommitdiff
path: root/t/t1508-at-combinations.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-01-28 09:52:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-28 20:12:42 (GMT)
commitd46a8301930ae83de30fbbbbce1bb02a98745204 (patch)
treed58efd6ccd18ee97fc9e518c3d348f6920f0d901 /t/t1508-at-combinations.sh
parent42cab601cfd0364c57434f90c6ba66a1ccb179ec (diff)
downloadgit-d46a8301930ae83de30fbbbbce1bb02a98745204.zip
git-d46a8301930ae83de30fbbbbce1bb02a98745204.tar.gz
git-d46a8301930ae83de30fbbbbce1bb02a98745204.tar.bz2
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>
Diffstat (limited to 't/t1508-at-combinations.sh')
-rwxr-xr-xt/t1508-at-combinations.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 59f0463..2a46af2 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}"