diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-08-31 04:31:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-03 19:14:29 (GMT) |
| commit | d0423ddd778a3699694cad326905bc755f7dd0dd (patch) | |
| tree | b6187efa088ac15a9210fb8790039b16fb32ece6 /t/t3200-branch.sh | |
| parent | 002ba0376b0836ff36f3ba1d079258ca94e66aca (diff) | |
| download | git-d0423ddd778a3699694cad326905bc755f7dd0dd.zip git-d0423ddd778a3699694cad326905bc755f7dd0dd.tar.gz git-d0423ddd778a3699694cad326905bc755f7dd0dd.tar.bz2 | |
t: branch: fix broken && chains
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 3134652..d85306f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -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 && |