Merge branch 'maint'

* maint: t1507: Test that branchname@{upstream} is interpreted as branch
git-mirror · Mar 17, 2013 · 1c71541 · 1c71541
2 parents bb79a82 + 617cf93
commit 1c71541
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 &&