diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-17 15:39:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 15:39:43 -0700 |
| commit | 1c71541ddd51968ca2957063b00da42941d13d98 (patch) | |
| tree | 8d7033f891dbb1964103488e5b7045e556c2cc84 | |
| parent | bb79a827a2bd4987b6def75a534635d75478cf4d (diff) | |
| parent | 617cf93182279eec554dda03f44ac6a250e183aa (diff) | |
| download | git-1c71541ddd51968ca2957063b00da42941d13d98.tar.gz | |
Merge branch 'maint'
* maint:
t1507: Test that branchname@{upstream} is interpreted as branch
| -rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 && |