mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-01 05:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

t: branch: fix broken && chains

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-08-30 23:31:50 -05:00 committed by Junio C Hamano
parent 002ba0376b
commit d0423ddd77
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t3200-branch.sh
View File

@ -425,14 +425,14 @@ test_expect_success '--set-upstream-to fails on a non-ref' '
test_expect_success 'use --set-upstream-to modify HEAD' '
test_config branch.master.remote foo &&
test_config branch.master.merge foo &&
git branch my12
git branch my12 &&
git branch --set-upstream-to my12 &&
test "$(git config branch.master.remote)" = "." &&
test "$(git config branch.master.merge)" = "refs/heads/my12"
'
test_expect_success 'use --set-upstream-to modify a particular branch' '
git branch my13
git branch my13 &&
git branch --set-upstream-to master my13 &&
test "$(git config branch.my13.remote)" = "." &&
test "$(git config branch.my13.merge)" = "refs/heads/master"
@ -443,7 +443,7 @@ test_expect_success '--unset-upstream should fail if given a non-existent branch
'
test_expect_success 'test --unset-upstream on HEAD' '
git branch my14
git branch my14 &&
test_config branch.master.remote foo &&
test_config branch.master.merge foo &&
git branch --set-upstream-to my14 &&
@ -465,7 +465,7 @@ test_expect_success '--unset-upstream should fail on detached HEAD' '
'
test_expect_success 'test --unset-upstream on a particular branch' '
git branch my15
git branch my15 &&
git branch --set-upstream-to master my14 &&
git branch --unset-upstream my14 &&
test_must_fail git config branch.my14.remote &&