t6000-t6999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 1, 2018 at 20:24 UTC
c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7
5 files changed
+17
-17
t/t6010-merge-base.sh
+1
-1
@@ -245,7 +245,7 @@ test_expect_success 'using reflog to find the fork point' '
245
git commit --allow-empty -m "Derived #$count" &&
246
git rev-parse HEAD >derived$count &&
247
git checkout -B base $E || exit 1
248
- done
248
+ done &&
249
250
for count in 1 2 3
251
do
t/t6029-merge-subtree.sh
+8
-8
@@ -55,7 +55,7 @@ test_expect_success 'initial merge' '
55
git checkout -b work &&
56
git ls-files -s >actual &&
57
(
58
- echo "100644 $o1 0 git-gui/git-gui.sh"
58
+ echo "100644 $o1 0 git-gui/git-gui.sh" &&
59
echo "100644 $o2 0 git.c"
60
) >expected &&
61
test_cmp expected actual
@@ -72,7 +72,7 @@ test_expect_success 'merge update' '
72
git pull -s subtree gui master2 &&
73
git ls-files -s >actual &&
74
(
75
- echo "100644 $o3 0 git-gui/git-gui.sh"
75
+ echo "100644 $o3 0 git-gui/git-gui.sh" &&
76
echo "100644 $o2 0 git.c"
77
) >expected &&
78
test_cmp expected actual
@@ -88,8 +88,8 @@ test_expect_success 'initial ambiguous subtree' '
88
git checkout -b work2 &&
89
git ls-files -s >actual &&
90
(
91
- echo "100644 $o1 0 git-gui/git-gui.sh"
92
- echo "100644 $o1 0 git-gui2/git-gui.sh"
91
+ echo "100644 $o1 0 git-gui/git-gui.sh" &&
92
+ echo "100644 $o1 0 git-gui2/git-gui.sh" &&
93
echo "100644 $o2 0 git.c"
94
) >expected &&
95
test_cmp expected actual
@@ -101,8 +101,8 @@ test_expect_success 'merge using explicit' '
101
git pull -Xsubtree=git-gui gui master2 &&
102
git ls-files -s >actual &&
103
(
104
- echo "100644 $o3 0 git-gui/git-gui.sh"
105
- echo "100644 $o1 0 git-gui2/git-gui.sh"
104
+ echo "100644 $o3 0 git-gui/git-gui.sh" &&
105
+ echo "100644 $o1 0 git-gui2/git-gui.sh" &&
106
echo "100644 $o2 0 git.c"
107
) >expected &&
108
test_cmp expected actual
@@ -114,8 +114,8 @@ test_expect_success 'merge2 using explicit' '
114
git pull -Xsubtree=git-gui2 gui master2 &&
115
git ls-files -s >actual &&
116
(
117
- echo "100644 $o1 0 git-gui/git-gui.sh"
118
- echo "100644 $o3 0 git-gui2/git-gui.sh"
117
+ echo "100644 $o1 0 git-gui/git-gui.sh" &&
118
+ echo "100644 $o3 0 git-gui2/git-gui.sh" &&
119
echo "100644 $o2 0 git.c"
120
) >expected &&
121
test_cmp expected actual
t/t6036-recursive-corner-cases.sh
+3
-3
@@ -72,7 +72,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
72
git rev-parse >actual \
73
:2:three :3:three &&
74
git hash-object >>actual \
75
- three~HEAD three~R2^0
75
+ three~HEAD three~R2^0 &&
76
test_cmp expect actual
77
)
78
'
@@ -148,7 +148,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
148
git rev-parse >actual \
149
:2:three :3:three &&
150
git hash-object >>actual \
151
- three~HEAD three~R2^0
151
+ three~HEAD three~R2^0 &&
152
test_cmp expect actual
153
)
154
'
@@ -228,7 +228,7 @@ test_expect_success 'git detects differently handled merges conflict' '
228
D:new_a E:new_a &&
229
git rev-parse >actual \
230
:2:new_a :3:new_a &&
231
- test_cmp expect actual
231
+ test_cmp expect actual &&
232
233
git cat-file -p B:new_a >ours &&
234
git cat-file -p C:new_a >theirs &&
t/t6042-merge-rename-corner-cases.sh
+4
-4
@@ -352,7 +352,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
352
base:file left-conflict:newfile right:file &&
353
git rev-parse >actual \
354
:1:newfile :2:newfile :3:newfile &&
355
- test_cmp expect actual
355
+ test_cmp expect actual &&
356
357
test_path_is_file newfile/realfile &&
358
test_path_is_file newfile~HEAD
@@ -580,7 +580,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
580
C:a A:a B:b C:C &&
581
git rev-parse >actual \
582
:3:a :1:a :2:b :3:c &&
583
- test_cmp expect actual
583
+ test_cmp expect actual &&
584
585
test_path_is_file a &&
586
test_path_is_file b &&
@@ -680,13 +680,13 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
680
A:a C:b B:b C:c B:c &&
681
git rev-parse >actual \
682
:1:a :2:b :3:b :2:c :3:c &&
683
- test_cmp expect actual
683
+ test_cmp expect actual &&
684
685
git rev-parse >expect \
686
C:c B:c C:b B:b &&
687
git hash-object >actual \
688
c~HEAD c~B\^0 b~HEAD b~B\^0 &&
689
- test_cmp expect actual
689
+ test_cmp expect actual &&
690
691
test_path_is_missing b &&
692
test_path_is_missing c
t/t6043-merge-rename-directories.sh
+1
-1
@@ -3583,7 +3583,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
3583
grep -q stuff z/c &&
3584
test_seq 1 10 >expected &&
3585
echo stuff >>expected &&
3586
- test_cmp expected z/c
3586
+ test_cmp expected z/c &&
3587
3588
git ls-files -s >out &&
3589
test_line_count = 4 out &&