t3030: 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:23 UTC
b6c32f63f30ac5f469780c1d522af36d9a67d334
1 file changed
+170
-170
t/t3030-merge-recursive.sh
+170
-170
@@ -36,15 +36,15 @@ test_expect_success 'setup 1' '
36
test_tick &&
37
git commit -m "master modifies a and d/e" &&
38
c1=$(git rev-parse --verify HEAD) &&
39
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
39
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
40
(
41
- echo "100644 blob $o1 a"
42
- echo "100644 blob $o0 b"
43
- echo "100644 blob $o0 c"
44
- echo "100644 blob $o1 d/e"
45
- echo "100644 $o1 0 a"
46
- echo "100644 $o0 0 b"
47
- echo "100644 $o0 0 c"
41
+ echo "100644 blob $o1 a" &&
42
+ echo "100644 blob $o0 b" &&
43
+ echo "100644 blob $o0 c" &&
44
+ echo "100644 blob $o1 d/e" &&
45
+ echo "100644 $o1 0 a" &&
46
+ echo "100644 $o0 0 b" &&
47
+ echo "100644 $o0 0 c" &&
48
echo "100644 $o1 0 d/e"
49
) >expected &&
50
test_cmp expected actual
@@ -54,15 +54,15 @@ test_expect_success 'setup 2' '
54
55
rm -rf [abcd] &&
56
git checkout side &&
57
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
57
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
58
(
59
- echo "100644 blob $o0 a"
60
- echo "100644 blob $o0 b"
61
- echo "100644 blob $o0 c"
62
- echo "100644 blob $o0 d/e"
63
- echo "100644 $o0 0 a"
64
- echo "100644 $o0 0 b"
65
- echo "100644 $o0 0 c"
59
+ echo "100644 blob $o0 a" &&
60
+ echo "100644 blob $o0 b" &&
61
+ echo "100644 blob $o0 c" &&
62
+ echo "100644 blob $o0 d/e" &&
63
+ echo "100644 $o0 0 a" &&
64
+ echo "100644 $o0 0 b" &&
65
+ echo "100644 $o0 0 c" &&
66
echo "100644 $o0 0 d/e"
67
) >expected &&
68
test_cmp expected actual &&
@@ -75,15 +75,15 @@ test_expect_success 'setup 2' '
75
test_tick &&
76
git commit -m "side modifies a" &&
77
c2=$(git rev-parse --verify HEAD) &&
78
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
78
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
79
(
80
- echo "100644 blob $o2 a"
81
- echo "100644 blob $o0 b"
82
- echo "100644 blob $o0 c"
83
- echo "100644 blob $o0 d/e"
84
- echo "100644 $o2 0 a"
85
- echo "100644 $o0 0 b"
86
- echo "100644 $o0 0 c"
80
+ echo "100644 blob $o2 a" &&
81
+ echo "100644 blob $o0 b" &&
82
+ echo "100644 blob $o0 c" &&
83
+ echo "100644 blob $o0 d/e" &&
84
+ echo "100644 $o2 0 a" &&
85
+ echo "100644 $o0 0 b" &&
86
+ echo "100644 $o0 0 c" &&
87
echo "100644 $o0 0 d/e"
88
) >expected &&
89
test_cmp expected actual
@@ -93,15 +93,15 @@ test_expect_success 'setup 3' '
93
94
rm -rf [abcd] &&
95
git checkout df-1 &&
96
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
96
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
97
(
98
- echo "100644 blob $o0 a"
99
- echo "100644 blob $o0 b"
100
- echo "100644 blob $o0 c"
101
- echo "100644 blob $o0 d/e"
102
- echo "100644 $o0 0 a"
103
- echo "100644 $o0 0 b"
104
- echo "100644 $o0 0 c"
98
+ echo "100644 blob $o0 a" &&
99
+ echo "100644 blob $o0 b" &&
100
+ echo "100644 blob $o0 c" &&
101
+ echo "100644 blob $o0 d/e" &&
102
+ echo "100644 $o0 0 a" &&
103
+ echo "100644 $o0 0 b" &&
104
+ echo "100644 $o0 0 c" &&
105
echo "100644 $o0 0 d/e"
106
) >expected &&
107
test_cmp expected actual &&
@@ -112,15 +112,15 @@ test_expect_success 'setup 3' '
112
test_tick &&
113
git commit -m "df-1 makes b/c" &&
114
c3=$(git rev-parse --verify HEAD) &&
115
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
115
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
116
(
117
- echo "100644 blob $o0 a"
118
- echo "100644 blob $o3 b/c"
119
- echo "100644 blob $o0 c"
120
- echo "100644 blob $o0 d/e"
121
- echo "100644 $o0 0 a"
122
- echo "100644 $o3 0 b/c"
123
- echo "100644 $o0 0 c"
117
+ echo "100644 blob $o0 a" &&
118
+ echo "100644 blob $o3 b/c" &&
119
+ echo "100644 blob $o0 c" &&
120
+ echo "100644 blob $o0 d/e" &&
121
+ echo "100644 $o0 0 a" &&
122
+ echo "100644 $o3 0 b/c" &&
123
+ echo "100644 $o0 0 c" &&
124
echo "100644 $o0 0 d/e"
125
) >expected &&
126
test_cmp expected actual
@@ -130,15 +130,15 @@ test_expect_success 'setup 4' '
130
131
rm -rf [abcd] &&
132
git checkout df-2 &&
133
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
133
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
134
(
135
- echo "100644 blob $o0 a"
136
- echo "100644 blob $o0 b"
137
- echo "100644 blob $o0 c"
138
- echo "100644 blob $o0 d/e"
139
- echo "100644 $o0 0 a"
140
- echo "100644 $o0 0 b"
141
- echo "100644 $o0 0 c"
135
+ echo "100644 blob $o0 a" &&
136
+ echo "100644 blob $o0 b" &&
137
+ echo "100644 blob $o0 c" &&
138
+ echo "100644 blob $o0 d/e" &&
139
+ echo "100644 $o0 0 a" &&
140
+ echo "100644 $o0 0 b" &&
141
+ echo "100644 $o0 0 c" &&
142
echo "100644 $o0 0 d/e"
143
) >expected &&
144
test_cmp expected actual &&
@@ -149,15 +149,15 @@ test_expect_success 'setup 4' '
149
test_tick &&
150
git commit -m "df-2 makes a/c" &&
151
c4=$(git rev-parse --verify HEAD) &&
152
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
152
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
153
(
154
- echo "100644 blob $o4 a/c"
155
- echo "100644 blob $o0 b"
156
- echo "100644 blob $o0 c"
157
- echo "100644 blob $o0 d/e"
158
- echo "100644 $o4 0 a/c"
159
- echo "100644 $o0 0 b"
160
- echo "100644 $o0 0 c"
154
+ echo "100644 blob $o4 a/c" &&
155
+ echo "100644 blob $o0 b" &&
156
+ echo "100644 blob $o0 c" &&
157
+ echo "100644 blob $o0 d/e" &&
158
+ echo "100644 $o4 0 a/c" &&
159
+ echo "100644 $o0 0 b" &&
160
+ echo "100644 $o0 0 c" &&
161
echo "100644 $o0 0 d/e"
162
) >expected &&
163
test_cmp expected actual
@@ -167,15 +167,15 @@ test_expect_success 'setup 5' '
167
168
rm -rf [abcd] &&
169
git checkout remove &&
170
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
170
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
171
(
172
- echo "100644 blob $o0 a"
173
- echo "100644 blob $o0 b"
174
- echo "100644 blob $o0 c"
175
- echo "100644 blob $o0 d/e"
176
- echo "100644 $o0 0 a"
177
- echo "100644 $o0 0 b"
178
- echo "100644 $o0 0 c"
172
+ echo "100644 blob $o0 a" &&
173
+ echo "100644 blob $o0 b" &&
174
+ echo "100644 blob $o0 c" &&
175
+ echo "100644 blob $o0 d/e" &&
176
+ echo "100644 $o0 0 a" &&
177
+ echo "100644 $o0 0 b" &&
178
+ echo "100644 $o0 0 c" &&
179
echo "100644 $o0 0 d/e"
180
) >expected &&
181
test_cmp expected actual &&
@@ -190,13 +190,13 @@ test_expect_success 'setup 5' '
190
test_tick &&
191
git commit -m "remove removes b and modifies a" &&
192
c5=$(git rev-parse --verify HEAD) &&
193
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
193
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
194
(
195
- echo "100644 blob $o5 a"
196
- echo "100644 blob $o0 c"
197
- echo "100644 blob $o0 d/e"
198
- echo "100644 $o5 0 a"
199
- echo "100644 $o0 0 c"
195
+ echo "100644 blob $o5 a" &&
196
+ echo "100644 blob $o0 c" &&
197
+ echo "100644 blob $o0 d/e" &&
198
+ echo "100644 $o5 0 a" &&
199
+ echo "100644 $o0 0 c" &&
200
echo "100644 $o0 0 d/e"
201
) >expected &&
202
test_cmp expected actual
@@ -207,15 +207,15 @@ test_expect_success 'setup 6' '
207
208
rm -rf [abcd] &&
209
git checkout df-3 &&
210
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
210
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
211
(
212
- echo "100644 blob $o0 a"
213
- echo "100644 blob $o0 b"
214
- echo "100644 blob $o0 c"
215
- echo "100644 blob $o0 d/e"
216
- echo "100644 $o0 0 a"
217
- echo "100644 $o0 0 b"
218
- echo "100644 $o0 0 c"
212
+ echo "100644 blob $o0 a" &&
213
+ echo "100644 blob $o0 b" &&
214
+ echo "100644 blob $o0 c" &&
215
+ echo "100644 blob $o0 d/e" &&
216
+ echo "100644 $o0 0 a" &&
217
+ echo "100644 $o0 0 b" &&
218
+ echo "100644 $o0 0 c" &&
219
echo "100644 $o0 0 d/e"
220
) >expected &&
221
test_cmp expected actual &&
@@ -226,15 +226,15 @@ test_expect_success 'setup 6' '
226
test_tick &&
227
git commit -m "df-3 makes d" &&
228
c6=$(git rev-parse --verify HEAD) &&
229
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
229
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
230
(
231
- echo "100644 blob $o0 a"
232
- echo "100644 blob $o0 b"
233
- echo "100644 blob $o0 c"
234
- echo "100644 blob $o6 d"
235
- echo "100644 $o0 0 a"
236
- echo "100644 $o0 0 b"
237
- echo "100644 $o0 0 c"
231
+ echo "100644 blob $o0 a" &&
232
+ echo "100644 blob $o0 b" &&
233
+ echo "100644 blob $o0 c" &&
234
+ echo "100644 blob $o6 d" &&
235
+ echo "100644 $o0 0 a" &&
236
+ echo "100644 $o0 0 b" &&
237
+ echo "100644 $o0 0 c" &&
238
echo "100644 $o6 0 d"
239
) >expected &&
240
test_cmp expected actual
@@ -286,11 +286,11 @@ test_expect_success 'merge-recursive result' '
286
287
git ls-files -s >actual &&
288
(
289
- echo "100644 $o0 1 a"
290
- echo "100644 $o2 2 a"
291
- echo "100644 $o1 3 a"
292
- echo "100644 $o0 0 b"
293
- echo "100644 $o0 0 c"
289
+ echo "100644 $o0 1 a" &&
290
+ echo "100644 $o2 2 a" &&
291
+ echo "100644 $o1 3 a" &&
292
+ echo "100644 $o0 0 b" &&
293
+ echo "100644 $o0 0 c" &&
294
echo "100644 $o1 0 d/e"
295
) >expected &&
296
test_cmp expected actual
@@ -325,10 +325,10 @@ test_expect_success 'merge-recursive remove conflict' '
325
326
git ls-files -s >actual &&
327
(
328
- echo "100644 $o0 1 a"
329
- echo "100644 $o1 2 a"
330
- echo "100644 $o5 3 a"
331
- echo "100644 $o0 0 c"
328
+ echo "100644 $o0 1 a" &&
329
+ echo "100644 $o1 2 a" &&
330
+ echo "100644 $o5 3 a" &&
331
+ echo "100644 $o0 0 c" &&
332
echo "100644 $o1 0 d/e"
333
) >expected &&
334
test_cmp expected actual
@@ -347,9 +347,9 @@ test_expect_success 'merge-recursive result' '
347
348
git ls-files -s >actual &&
349
(
350
- echo "100644 $o1 0 a"
351
- echo "100644 $o3 0 b/c"
352
- echo "100644 $o0 0 c"
350
+ echo "100644 $o1 0 a" &&
351
+ echo "100644 $o3 0 b/c" &&
352
+ echo "100644 $o0 0 c" &&
353
echo "100644 $o1 0 d/e"
354
) >expected &&
355
test_cmp expected actual
@@ -369,11 +369,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
369
370
git ls-files -s >actual &&
371
(
372
- echo "100644 $o0 1 a"
373
- echo "100644 $o1 2 a"
374
- echo "100644 $o4 0 a/c"
375
- echo "100644 $o0 0 b"
376
- echo "100644 $o0 0 c"
372
+ echo "100644 $o0 1 a" &&
373
+ echo "100644 $o1 2 a" &&
374
+ echo "100644 $o4 0 a/c" &&
375
+ echo "100644 $o0 0 b" &&
376
+ echo "100644 $o0 0 c" &&
377
echo "100644 $o1 0 d/e"
378
) >expected &&
379
test_cmp expected actual
@@ -393,11 +393,11 @@ test_expect_success 'merge-recursive d/f conflict result the other way' '
393
394
git ls-files -s >actual &&
395
(
396
- echo "100644 $o0 1 a"
397
- echo "100644 $o1 3 a"
398
- echo "100644 $o4 0 a/c"
399
- echo "100644 $o0 0 b"
400
- echo "100644 $o0 0 c"
396
+ echo "100644 $o0 1 a" &&
397
+ echo "100644 $o1 3 a" &&
398
+ echo "100644 $o4 0 a/c" &&
399
+ echo "100644 $o0 0 b" &&
400
+ echo "100644 $o0 0 c" &&
401
echo "100644 $o1 0 d/e"
402
) >expected &&
403
test_cmp expected actual
@@ -417,11 +417,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
417
418
git ls-files -s >actual &&
419
(
420
- echo "100644 $o1 0 a"
421
- echo "100644 $o0 0 b"
422
- echo "100644 $o0 0 c"
423
- echo "100644 $o6 3 d"
424
- echo "100644 $o0 1 d/e"
420
+ echo "100644 $o1 0 a" &&
421
+ echo "100644 $o0 0 b" &&
422
+ echo "100644 $o0 0 c" &&
423
+ echo "100644 $o6 3 d" &&
424
+ echo "100644 $o0 1 d/e" &&
425
echo "100644 $o1 2 d/e"
426
) >expected &&
427
test_cmp expected actual
@@ -441,11 +441,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
441
442
git ls-files -s >actual &&
443
(
444
- echo "100644 $o1 0 a"
445
- echo "100644 $o0 0 b"
446
- echo "100644 $o0 0 c"
447
- echo "100644 $o6 2 d"
448
- echo "100644 $o0 1 d/e"
444
+ echo "100644 $o1 0 a" &&
445
+ echo "100644 $o0 0 b" &&
446
+ echo "100644 $o0 0 c" &&
447
+ echo "100644 $o6 2 d" &&
448
+ echo "100644 $o0 1 d/e" &&
449
echo "100644 $o1 3 d/e"
450
) >expected &&
451
test_cmp expected actual
@@ -465,13 +465,13 @@ test_expect_success 'reset and bind merge' '
465
git read-tree --prefix=M/ master &&
466
git ls-files -s >actual &&
467
(
468
- echo "100644 $o1 0 M/a"
469
- echo "100644 $o0 0 M/b"
470
- echo "100644 $o0 0 M/c"
471
- echo "100644 $o1 0 M/d/e"
472
- echo "100644 $o1 0 a"
473
- echo "100644 $o0 0 b"
474
- echo "100644 $o0 0 c"
468
+ echo "100644 $o1 0 M/a" &&
469
+ echo "100644 $o0 0 M/b" &&
470
+ echo "100644 $o0 0 M/c" &&
471
+ echo "100644 $o1 0 M/d/e" &&
472
+ echo "100644 $o1 0 a" &&
473
+ echo "100644 $o0 0 b" &&
474
+ echo "100644 $o0 0 c" &&
475
echo "100644 $o1 0 d/e"
476
) >expected &&
477
test_cmp expected actual &&
@@ -479,17 +479,17 @@ test_expect_success 'reset and bind merge' '
479
git read-tree --prefix=a1/ master &&
480
git ls-files -s >actual &&
481
(
482
- echo "100644 $o1 0 M/a"
483
- echo "100644 $o0 0 M/b"
484
- echo "100644 $o0 0 M/c"
485
- echo "100644 $o1 0 M/d/e"
486
- echo "100644 $o1 0 a"
487
- echo "100644 $o1 0 a1/a"
488
- echo "100644 $o0 0 a1/b"
489
- echo "100644 $o0 0 a1/c"
490
- echo "100644 $o1 0 a1/d/e"
491
- echo "100644 $o0 0 b"
492
- echo "100644 $o0 0 c"
482
+ echo "100644 $o1 0 M/a" &&
483
+ echo "100644 $o0 0 M/b" &&
484
+ echo "100644 $o0 0 M/c" &&
485
+ echo "100644 $o1 0 M/d/e" &&
486
+ echo "100644 $o1 0 a" &&
487
+ echo "100644 $o1 0 a1/a" &&
488
+ echo "100644 $o0 0 a1/b" &&
489
+ echo "100644 $o0 0 a1/c" &&
490
+ echo "100644 $o1 0 a1/d/e" &&
491
+ echo "100644 $o0 0 b" &&
492
+ echo "100644 $o0 0 c" &&
493
echo "100644 $o1 0 d/e"
494
) >expected &&
495
test_cmp expected actual &&
@@ -497,21 +497,21 @@ test_expect_success 'reset and bind merge' '
497
git read-tree --prefix=z/ master &&
498
git ls-files -s >actual &&
499
(
500
- echo "100644 $o1 0 M/a"
501
- echo "100644 $o0 0 M/b"
502
- echo "100644 $o0 0 M/c"
503
- echo "100644 $o1 0 M/d/e"
504
- echo "100644 $o1 0 a"
505
- echo "100644 $o1 0 a1/a"
506
- echo "100644 $o0 0 a1/b"
507
- echo "100644 $o0 0 a1/c"
508
- echo "100644 $o1 0 a1/d/e"
509
- echo "100644 $o0 0 b"
510
- echo "100644 $o0 0 c"
511
- echo "100644 $o1 0 d/e"
512
- echo "100644 $o1 0 z/a"
513
- echo "100644 $o0 0 z/b"
514
- echo "100644 $o0 0 z/c"
500
+ echo "100644 $o1 0 M/a" &&
501
+ echo "100644 $o0 0 M/b" &&
502
+ echo "100644 $o0 0 M/c" &&
503
+ echo "100644 $o1 0 M/d/e" &&
504
+ echo "100644 $o1 0 a" &&
505
+ echo "100644 $o1 0 a1/a" &&
506
+ echo "100644 $o0 0 a1/b" &&
507
+ echo "100644 $o0 0 a1/c" &&
508
+ echo "100644 $o1 0 a1/d/e" &&
509
+ echo "100644 $o0 0 b" &&
510
+ echo "100644 $o0 0 c" &&
511
+ echo "100644 $o1 0 d/e" &&
512
+ echo "100644 $o1 0 z/a" &&
513
+ echo "100644 $o0 0 z/b" &&
514
+ echo "100644 $o0 0 z/c" &&
515
echo "100644 $o1 0 z/d/e"
516
) >expected &&
517
test_cmp expected actual
@@ -589,8 +589,8 @@ test_expect_success 'merge-recursive simple w/submodule result' '
589
590
git ls-files -s >actual &&
591
(
592
- echo "100644 $o5 0 a"
593
- echo "100644 $o0 0 c"
592
+ echo "100644 $o5 0 a" &&
593
+ echo "100644 $o0 0 c" &&
594
echo "160000 $c1 0 d"
595
) >expected &&
596
test_cmp expected actual
@@ -601,13 +601,13 @@ test_expect_success 'merge-recursive copy vs. rename' '
601
git merge rename &&
602
( git ls-tree -r HEAD && git ls-files -s ) >actual &&
603
(
604
- echo "100644 blob $o0 b"
605
- echo "100644 blob $o0 c"
606
- echo "100644 blob $o0 d/e"
607
- echo "100644 blob $o0 e"
608
- echo "100644 $o0 0 b"
609
- echo "100644 $o0 0 c"
610
- echo "100644 $o0 0 d/e"
604
+ echo "100644 blob $o0 b" &&
605
+ echo "100644 blob $o0 c" &&
606
+ echo "100644 blob $o0 d/e" &&
607
+ echo "100644 blob $o0 e" &&
608
+ echo "100644 $o0 0 b" &&
609
+ echo "100644 $o0 0 c" &&
610
+ echo "100644 $o0 0 d/e" &&
611
echo "100644 $o0 0 e"
612
) >expected &&
613
test_cmp expected actual
@@ -617,17 +617,17 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' '
617
618
git checkout -f rename &&
619
git merge rename-ln &&
620
- ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
620
+ ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
621
(
622
- echo "120000 blob $oln a"
623
- echo "100644 blob $o0 b"
624
- echo "100644 blob $o0 c"
625
- echo "100644 blob $o0 d/e"
626
- echo "100644 blob $o0 e"
627
- echo "120000 $oln 0 a"
628
- echo "100644 $o0 0 b"
629
- echo "100644 $o0 0 c"
630
- echo "100644 $o0 0 d/e"
622
+ echo "120000 blob $oln a" &&
623
+ echo "100644 blob $o0 b" &&
624
+ echo "100644 blob $o0 c" &&
625
+ echo "100644 blob $o0 d/e" &&
626
+ echo "100644 blob $o0 e" &&
627
+ echo "120000 $oln 0 a" &&
628
+ echo "100644 $o0 0 b" &&
629
+ echo "100644 $o0 0 c" &&
630
+ echo "100644 $o0 0 d/e" &&
631
echo "100644 $o0 0 e"
632
) >expected &&
633
test_cmp expected actual