From 617cf93182279eec554dda03f44ac6a250e183aa Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Sun, 17 Mar 2013 23:17:09 +0100 Subject: t1507: Test that branchname@{upstream} is interpreted as branch Syntax branchname@{upstream} should interpret its argument as a name of a branch. Add the test to check that it doesn't try to interpret it as a refname if the branch in question does not exist. Signed-off-by: Kacper Kornet Signed-off-by: Junio C Hamano --- t/t1507-rev-parse-upstream.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index d6e576192f..b27a7209f7 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -54,6 +54,10 @@ test_expect_success 'my-side@{upstream} resolves to correct full name' ' test refs/remotes/origin/side = "$(full_name my-side@{u})" ' +test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' ' + test_must_fail full_name refs/heads/my-side@{upstream} +' + test_expect_success 'my-side@{u} resolves to correct commit' ' git checkout side && test_commit 5 && -- cgit v1.2.3