undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t1507: Test that branchname@{upstream} is interpreted as branch
This commit is contained in:
Junio C Hamano 2013-03-17 15:39:43 -07:00
commit 1c71541ddd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t1507-rev-parse-upstream.sh
View File

@ -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 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' ' test_expect_success 'my-side@{u} resolves to correct commit' '
git checkout side && git checkout side &&
test_commit 5 && test_commit 5 &&