t: branch: fix broken && chains
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Aug 30, 2013 at 23:31 UTC
d0423ddd778a3699694cad326905bc755f7dd0dd
1 file changed
+4
-4
t/t3200-branch.sh
+4
-4
@@ -425,14 +425,14 @@ test_expect_success '--set-upstream-to fails on a non-ref' '
425
test_expect_success 'use --set-upstream-to modify HEAD' '
426
test_config branch.master.remote foo &&
427
test_config branch.master.merge foo &&
428
- git branch my12
428
+ git branch my12 &&
429
git branch --set-upstream-to my12 &&
430
test "$(git config branch.master.remote)" = "." &&
431
test "$(git config branch.master.merge)" = "refs/heads/my12"
432
'
433
434
test_expect_success 'use --set-upstream-to modify a particular branch' '
435
- git branch my13
435
+ git branch my13 &&
436
git branch --set-upstream-to master my13 &&
437
test "$(git config branch.my13.remote)" = "." &&
438
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
443
'
444
445
test_expect_success 'test --unset-upstream on HEAD' '
446
- git branch my14
446
+ git branch my14 &&
447
test_config branch.master.remote foo &&
448
test_config branch.master.merge foo &&
449
git branch --set-upstream-to my14 &&
@@ -465,7 +465,7 @@ test_expect_success '--unset-upstream should fail on detached HEAD' '
465
'
466
467
test_expect_success 'test --unset-upstream on a particular branch' '
468
- git branch my15
468
+ git branch my15 &&
469
git branch --set-upstream-to master my14 &&
470
git branch --unset-upstream my14 &&
471
test_must_fail git config branch.my14.remote &&