Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 17 Mar 2013 22:39:43 +0000
(15:39 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 17 Mar 2013 22:39:43 +0000
(15:39 -0700)
* maint:
t1507: Test that branchname@{upstream} is interpreted as branch
t/t1507-rev-parse-upstream.sh
patch
|
blob
|
history
raw
(from parent 1:
bb79a82
)
diff --git
a/t/t1507-rev-parse-upstream.sh
b/t/t1507-rev-parse-upstream.sh
index d6e576192fcd014ed5f570ceeab1152b93d91d1f..b27a7209f7401706f3b0a37b495fc0cb3a07c29e 100755
(executable)
--- 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 &&