t6036, t6042: use test_line_count instead of wc -l
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
May 24, 2018 at 00:04 UTC
0cdabc10839809162154e488fae82be51c57e23b
2 files changed
+134
-67
t/t6036-recursive-corner-cases.sh
+68
-34
@@ -65,9 +65,12 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
65
66
test_must_fail git merge -s recursive R2^0 &&
67
68
- test 2 = $(git ls-files -s | wc -l) &&
69
- test 2 = $(git ls-files -u | wc -l) &&
70
- test 2 = $(git ls-files -o | wc -l) &&
68
+ git ls-files -s >out &&
69
+ test_line_count = 2 out &&
70
+ git ls-files -u >out &&
71
+ test_line_count = 2 out &&
72
+ git ls-files -o >out &&
73
+ test_line_count = 3 out &&
74
75
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
76
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
@@ -135,9 +138,12 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
138
139
test_must_fail git merge -s recursive R2^0 &&
140
138
- test 2 = $(git ls-files -s | wc -l) &&
139
- test 2 = $(git ls-files -u | wc -l) &&
140
- test 2 = $(git ls-files -o | wc -l) &&
141
+ git ls-files -s >out &&
142
+ test_line_count = 2 out &&
143
+ git ls-files -u >out &&
144
+ test_line_count = 2 out &&
145
+ git ls-files -o >out &&
146
+ test_line_count = 3 out &&
147
148
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
149
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
@@ -211,9 +217,12 @@ test_expect_success 'git detects differently handled merges conflict' '
217
218
test_must_fail git merge -s recursive E^0 &&
219
214
- test 3 = $(git ls-files -s | wc -l) &&
215
- test 3 = $(git ls-files -u | wc -l) &&
216
- test 0 = $(git ls-files -o | wc -l) &&
220
+ git ls-files -s >out &&
221
+ test_line_count = 3 out &&
222
+ git ls-files -u >out &&
223
+ test_line_count = 3 out &&
224
+ git ls-files -o >out &&
225
+ test_line_count = 1 out &&
226
227
test $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) &&
228
test $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&
@@ -297,8 +306,10 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
306
307
test_must_fail git merge -s recursive E^0 &&
308
300
- test 2 -eq $(git ls-files -s | wc -l) &&
301
- test 2 -eq $(git ls-files -u | wc -l) &&
309
+ git ls-files -s >out &&
310
+ test_line_count = 2 out &&
311
+ git ls-files -u >out &&
312
+ test_line_count = 2 out &&
313
314
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
315
test $(git rev-parse :2:file) = $(git rev-parse B:file)
@@ -314,8 +325,10 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
325
326
test_must_fail git merge -s recursive D^0 &&
327
317
- test 2 -eq $(git ls-files -s | wc -l) &&
318
- test 2 -eq $(git ls-files -u | wc -l) &&
328
+ git ls-files -s >out &&
329
+ test_line_count = 2 out &&
330
+ git ls-files -u >out &&
331
+ test_line_count = 2 out &&
332
333
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
334
test $(git rev-parse :3:file) = $(git rev-parse B:file)
@@ -423,9 +436,12 @@ test_expect_success 'merge of D & E1 fails but has appropriate contents' '
436
437
test_must_fail git merge -s recursive E1^0 &&
438
426
- test 2 -eq $(git ls-files -s | wc -l) &&
427
- test 1 -eq $(git ls-files -u | wc -l) &&
428
- test 0 -eq $(git ls-files -o | wc -l) &&
439
+ git ls-files -s >out &&
440
+ test_line_count = 2 out &&
441
+ git ls-files -u >out &&
442
+ test_line_count = 1 out &&
443
+ git ls-files -o >out &&
444
+ test_line_count = 1 out &&
445
446
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
447
test $(git rev-parse :2:a) = $(git rev-parse B:a)
@@ -440,9 +456,12 @@ test_expect_success 'merge of E1 & D fails but has appropriate contents' '
456
457
test_must_fail git merge -s recursive D^0 &&
458
443
- test 2 -eq $(git ls-files -s | wc -l) &&
444
- test 1 -eq $(git ls-files -u | wc -l) &&
445
- test 0 -eq $(git ls-files -o | wc -l) &&
459
+ git ls-files -s >out &&
460
+ test_line_count = 2 out &&
461
+ git ls-files -u >out &&
462
+ test_line_count = 1 out &&
463
+ git ls-files -o >out &&
464
+ test_line_count = 1 out &&
465
466
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
467
test $(git rev-parse :3:a) = $(git rev-parse B:a)
@@ -457,9 +476,12 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
476
477
test_must_fail git merge -s recursive E2^0 &&
478
460
- test 4 -eq $(git ls-files -s | wc -l) &&
461
- test 3 -eq $(git ls-files -u | wc -l) &&
462
- test 1 -eq $(git ls-files -o | wc -l) &&
479
+ git ls-files -s >out &&
480
+ test_line_count = 4 out &&
481
+ git ls-files -u >out &&
482
+ test_line_count = 3 out &&
483
+ git ls-files -o >out &&
484
+ test_line_count = 2 out &&
485
486
test $(git rev-parse :2:a) = $(git rev-parse B:a) &&
487
test $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) &&
@@ -478,9 +500,12 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
500
501
test_must_fail git merge -s recursive D^0 &&
502
481
- test 4 -eq $(git ls-files -s | wc -l) &&
482
- test 3 -eq $(git ls-files -u | wc -l) &&
483
- test 1 -eq $(git ls-files -o | wc -l) &&
503
+ git ls-files -s >out &&
504
+ test_line_count = 4 out &&
505
+ git ls-files -u >out &&
506
+ test_line_count = 3 out &&
507
+ git ls-files -o >out &&
508
+ test_line_count = 2 out &&
509
510
test $(git rev-parse :3:a) = $(git rev-parse B:a) &&
511
test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) &&
@@ -574,9 +599,12 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li
599
600
git merge -s recursive E^0 &&
601
577
- test 1 -eq $(git ls-files -s | wc -l) &&
578
- test 0 -eq $(git ls-files -u | wc -l) &&
579
- test 0 -eq $(git ls-files -o | wc -l) &&
602
+ git ls-files -s >out &&
603
+ test_line_count = 1 out &&
604
+ git ls-files -u >out &&
605
+ test_line_count = 0 out &&
606
+ git ls-files -o >out &&
607
+ test_line_count = 1 out &&
608
609
test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
610
)
@@ -653,9 +681,12 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '
681
682
git merge -s recursive E^0 &&
683
656
- test 3 -eq $(git ls-files -s | wc -l) &&
657
- test 0 -eq $(git ls-files -u | wc -l) &&
658
- test 0 -eq $(git ls-files -o | wc -l) &&
684
+ git ls-files -s >out &&
685
+ test_line_count = 3 out &&
686
+ git ls-files -u >out &&
687
+ test_line_count = 0 out &&
688
+ git ls-files -o >out &&
689
+ test_line_count = 1 out &&
690
691
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
692
test $(git rev-parse HEAD:c) = $(git rev-parse A:a) &&
@@ -727,9 +758,12 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
758
759
git merge -s recursive E^0 &&
760
730
- test 2 -eq $(git ls-files -s | wc -l) &&
731
- test 0 -eq $(git ls-files -u | wc -l) &&
732
- test 0 -eq $(git ls-files -o | wc -l) &&
761
+ git ls-files -s >out &&
762
+ test_line_count = 2 out &&
763
+ git ls-files -u >out &&
764
+ test_line_count = 0 out &&
765
+ git ls-files -o >out &&
766
+ test_line_count = 1 out &&
767
768
test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
769
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
t/t6042-merge-rename-corner-cases.sh
+66
-33
@@ -116,9 +116,12 @@ test_expect_failure 'conflict caused if rename not detected' '
116
git checkout -q C^0 &&
117
git merge -s recursive B^0 &&
118
119
- test 3 -eq $(git ls-files -s | wc -l) &&
120
- test 0 -eq $(git ls-files -u | wc -l) &&
121
- test 0 -eq $(git ls-files -o | wc -l) &&
119
+ git ls-files -s >out &&
120
+ test_line_count = 3 out &&
121
+ git ls-files -u >out &&
122
+ test_line_count = 0 out &&
123
+ git ls-files -o >out &&
124
+ test_line_count = 1 out &&
125
126
test_line_count = 6 c &&
127
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
@@ -203,9 +206,12 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
206
207
git merge -s recursive C^0 &&
208
206
- test 2 -eq $(git ls-files -s | wc -l) &&
207
- test 2 -eq $(git ls-files -u | wc -l) &&
208
- test 0 -eq $(git ls-files -o | wc -l) &&
209
+ git ls-files -s >out &&
210
+ test_line_count = 2 out &&
211
+ git ls-files -u >out &&
212
+ test_line_count = 2 out &&
213
+ git ls-files -o >out &&
214
+ test_line_count = 1 out &&
215
216
test -f a &&
217
test -f b &&
@@ -223,9 +229,12 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
229
230
git merge -s recursive B^0 &&
231
226
- test 2 -eq $(git ls-files -s | wc -l) &&
227
- test 2 -eq $(git ls-files -u | wc -l) &&
228
- test 0 -eq $(git ls-files -o | wc -l) &&
232
+ git ls-files -s >out &&
233
+ test_line_count = 2 out &&
234
+ git ls-files -u >out &&
235
+ test_line_count = 2 out &&
236
+ git ls-files -o >out &&
237
+ test_line_count = 1 out &&
238
239
test -f a &&
240
test -f b &&
@@ -279,9 +288,12 @@ test_expect_success 'rename/directory conflict + clean content merge' '
288
289
test_must_fail git merge -s recursive right^0 &&
290
282
- test 2 -eq $(git ls-files -s | wc -l) &&
283
- test 1 -eq $(git ls-files -u | wc -l) &&
284
- test 1 -eq $(git ls-files -o | wc -l) &&
291
+ git ls-files -s >out &&
292
+ test_line_count = 2 out &&
293
+ git ls-files -u >out &&
294
+ test_line_count = 1 out &&
295
+ git ls-files -o >out &&
296
+ test_line_count = 2 out &&
297
298
echo 0 >expect &&
299
git cat-file -p base:file >>expect &&
@@ -307,9 +319,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
319
320
test_must_fail git merge -s recursive right^0 &&
321
310
- test 4 -eq $(git ls-files -s | wc -l) &&
311
- test 3 -eq $(git ls-files -u | wc -l) &&
312
- test 1 -eq $(git ls-files -o | wc -l) &&
322
+ git ls-files -s >out &&
323
+ test_line_count = 4 out &&
324
+ git ls-files -u >out &&
325
+ test_line_count = 3 out &&
326
+ git ls-files -o >out &&
327
+ test_line_count = 2 out &&
328
329
git cat-file -p left-conflict:newfile >left &&
330
git cat-file -p base:file >base &&
@@ -367,9 +382,12 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
382
383
git merge -s recursive right^0 &&
384
370
- test 1 -eq $(git ls-files -s | wc -l) &&
371
- test 0 -eq $(git ls-files -u | wc -l) &&
372
- test 0 -eq $(git ls-files -o | wc -l) &&
385
+ git ls-files -s >out &&
386
+ test_line_count = 1 out &&
387
+ git ls-files -u >out &&
388
+ test_line_count = 0 out &&
389
+ git ls-files -o >out &&
390
+ test_line_count = 1 out &&
391
392
echo 0 >expect &&
393
git cat-file -p base:sub/file >>expect &&
@@ -426,10 +444,14 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
444
test_must_fail git merge -s recursive C^0 >out &&
445
test_i18ngrep "CONFLICT (rename/rename)" out &&
446
429
- test 2 -eq $(git ls-files -s | wc -l) &&
430
- test 2 -eq $(git ls-files -u | wc -l) &&
431
- test 2 -eq $(git ls-files -u c | wc -l) &&
432
- test 3 -eq $(git ls-files -o | wc -l) &&
447
+ git ls-files -s >out &&
448
+ test_line_count = 2 out &&
449
+ git ls-files -u >out &&
450
+ test_line_count = 2 out &&
451
+ git ls-files -u c >out &&
452
+ test_line_count = 2 out &&
453
+ git ls-files -o >out &&
454
+ test_line_count = 3 out &&
455
456
test ! -f a &&
457
test ! -f b &&
@@ -476,9 +498,12 @@ test_expect_success 'merge has correct working tree contents' '
498
499
test_must_fail git merge -s recursive B^0 &&
500
479
- test 3 -eq $(git ls-files -s | wc -l) &&
480
- test 3 -eq $(git ls-files -u | wc -l) &&
481
- test 0 -eq $(git ls-files -o | wc -l) &&
501
+ git ls-files -s >out &&
502
+ test_line_count = 3 out &&
503
+ git ls-files -u >out &&
504
+ test_line_count = 3 out &&
505
+ git ls-files -o >out &&
506
+ test_line_count = 1 out &&
507
508
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
509
test $(git rev-parse :3:b) = $(git rev-parse A:a) &&
@@ -527,8 +552,10 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
552
553
test_must_fail git merge -s recursive C^0 &&
554
530
- test 4 -eq $(git ls-files -s | wc -l) &&
531
- test 0 -eq $(git ls-files -o | wc -l) &&
555
+ git ls-files -s >out &&
556
+ test_line_count = 4 out &&
557
+ git ls-files -o >out &&
558
+ test_line_count = 1 out &&
559
560
test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
561
test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
@@ -573,8 +600,10 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
600
git checkout C^0 &&
601
git merge -s recursive B^0 &&
602
576
- test 2 -eq $(git ls-files -s | wc -l) &&
577
- test 0 -eq $(git ls-files -o | wc -l) &&
603
+ git ls-files -s >out &&
604
+ test_line_count = 2 out &&
605
+ git ls-files -o >out &&
606
+ test_line_count = 1 out &&
607
608
test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
609
test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
@@ -615,10 +644,14 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
644
git checkout C^0 &&
645
test_must_fail git merge -s recursive B^0 &&
646
618
- test 5 -eq $(git ls-files -s | wc -l) &&
619
- test 2 -eq $(git ls-files -u b | wc -l) &&
620
- test 2 -eq $(git ls-files -u c | wc -l) &&
621
- test 4 -eq $(git ls-files -o | wc -l) &&
647
+ git ls-files -s >out &&
648
+ test_line_count = 5 out &&
649
+ git ls-files -u b >out &&
650
+ test_line_count = 2 out &&
651
+ git ls-files -u c >out &&
652
+ test_line_count = 2 out &&
653
+ git ls-files -o >out &&
654
+ test_line_count = 5 out &&
655
656
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
657
test $(git rev-parse :2:b) = $(git rev-parse C:b) &&