t7610: unsuppress output
The output for commands used to be suppressed by redirecting both stdout and stderr to /dev/null. However, this should not happen since the output is useful for debugging and, without the "-v" flag, test scripts don't output anyway. Unsuppress the output by removing the redirections to /dev/null. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Apr 24, 2019 at 15:46 UTC
e9d309e2fcd4faaeee9d20ef2a46bf86a4847bd0
1 file changed
+61
-61
t/t7610-mergetool.sh
+61
-61
@@ -130,14 +130,14 @@ test_expect_success 'custom mergetool' '
130
test_when_finished "git reset --hard" &&
131
git checkout -b test$test_count branch1 &&
132
git submodule update -N &&
133
- test_must_fail git merge master >/dev/null 2>&1 &&
134
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
133
+ test_must_fail git merge master &&
134
+ ( yes "" | git mergetool both ) &&
135
( yes "" | git mergetool file1 file1 ) &&
136
- ( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
137
- ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
138
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
139
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
140
- ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
136
+ ( yes "" | git mergetool file2 "spaced name" ) &&
137
+ ( yes "" | git mergetool subdir/file3 ) &&
138
+ ( yes "d" | git mergetool file11 ) &&
139
+ ( yes "d" | git mergetool file12 ) &&
140
+ ( yes "l" | git mergetool submod ) &&
141
test "$(cat file1)" = "master updated" &&
142
test "$(cat file2)" = "master new" &&
143
test "$(cat subdir/file3)" = "master new sub" &&
@@ -153,15 +153,15 @@ test_expect_success 'mergetool crlf' '
153
# test_when_finished is LIFO.)
154
test_config core.autocrlf true &&
155
git checkout -b test$test_count branch1 &&
156
- test_must_fail git merge master >/dev/null 2>&1 &&
157
- ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
158
- ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
159
- ( yes "" | git mergetool "spaced name" >/dev/null 2>&1 ) &&
160
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
161
- ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
162
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
163
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
164
- ( yes "r" | git mergetool submod >/dev/null 2>&1 ) &&
156
+ test_must_fail git merge master &&
157
+ ( yes "" | git mergetool file1 ) &&
158
+ ( yes "" | git mergetool file2 ) &&
159
+ ( yes "" | git mergetool "spaced name" ) &&
160
+ ( yes "" | git mergetool both ) &&
161
+ ( yes "" | git mergetool subdir/file3 ) &&
162
+ ( yes "d" | git mergetool file11 ) &&
163
+ ( yes "d" | git mergetool file12 ) &&
164
+ ( yes "r" | git mergetool submod ) &&
165
test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
166
test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
167
test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
@@ -176,8 +176,8 @@ test_expect_success 'mergetool in subdir' '
176
git submodule update -N &&
177
(
178
cd subdir &&
179
- test_must_fail git merge master >/dev/null 2>&1 &&
180
- ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
179
+ test_must_fail git merge master &&
180
+ ( yes "" | git mergetool file3 ) &&
181
test "$(cat file3)" = "master new sub"
182
)
183
'
@@ -188,14 +188,14 @@ test_expect_success 'mergetool on file in parent dir' '
188
git submodule update -N &&
189
(
190
cd subdir &&
191
- test_must_fail git merge master >/dev/null 2>&1 &&
192
- ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
193
- ( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
194
- ( yes "" | git mergetool ../file2 ../spaced\ name >/dev/null 2>&1 ) &&
195
- ( yes "" | git mergetool ../both >/dev/null 2>&1 ) &&
196
- ( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
197
- ( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
198
- ( yes "l" | git mergetool ../submod >/dev/null 2>&1 ) &&
191
+ test_must_fail git merge master &&
192
+ ( yes "" | git mergetool file3 ) &&
193
+ ( yes "" | git mergetool ../file1 ) &&
194
+ ( yes "" | git mergetool ../file2 ../spaced\ name ) &&
195
+ ( yes "" | git mergetool ../both ) &&
196
+ ( yes "d" | git mergetool ../file11 ) &&
197
+ ( yes "d" | git mergetool ../file12 ) &&
198
+ ( yes "l" | git mergetool ../submod ) &&
199
test "$(cat ../file1)" = "master updated" &&
200
test "$(cat ../file2)" = "master new" &&
201
test "$(cat ../submod/bar)" = "branch1 submodule" &&
@@ -209,9 +209,9 @@ test_expect_success 'mergetool skips autoresolved' '
209
git submodule update -N &&
210
test_must_fail git merge master &&
211
test -n "$(git ls-files -u)" &&
212
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
213
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
214
- ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
212
+ ( yes "d" | git mergetool file11 ) &&
213
+ ( yes "d" | git mergetool file12 ) &&
214
+ ( yes "l" | git mergetool submod ) &&
215
output="$(git mergetool --no-prompt)" &&
216
test "$output" = "No files need merging"
217
'
@@ -259,9 +259,9 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' '
259
rm -rf .git/rr-cache &&
260
git checkout -b test$test_count branch1 &&
261
git submodule update -N &&
262
- test_must_fail git merge master >/dev/null 2>&1 &&
263
- ( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
264
- ( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
262
+ test_must_fail git merge master &&
263
+ ( yes "l" | git mergetool --no-prompt submod ) &&
264
+ ( yes "d" "d" | git mergetool --no-prompt ) &&
265
git submodule update -N &&
266
output="$(yes "n" | git mergetool --no-prompt)" &&
267
test "$output" = "No files need merging"
@@ -369,9 +369,9 @@ test_expect_success 'deleted vs modified submodule' '
369
git checkout -b test$test_count.a test$test_count &&
370
test_must_fail git merge master &&
371
test -n "$(git ls-files -u)" &&
372
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
373
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
374
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
372
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
373
+ ( yes "" | git mergetool both ) &&
374
+ ( yes "d" | git mergetool file11 file12 ) &&
375
( yes "r" | git mergetool submod ) &&
376
rmdir submod && mv submod-movedaside submod &&
377
test "$(cat submod/bar)" = "branch1 submodule" &&
@@ -386,9 +386,9 @@ test_expect_success 'deleted vs modified submodule' '
386
git submodule update -N &&
387
test_must_fail git merge master &&
388
test -n "$(git ls-files -u)" &&
389
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
390
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
391
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
389
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
390
+ ( yes "" | git mergetool both ) &&
391
+ ( yes "d" | git mergetool file11 file12 ) &&
392
( yes "l" | git mergetool submod ) &&
393
test ! -e submod &&
394
output="$(git mergetool --no-prompt)" &&
@@ -400,9 +400,9 @@ test_expect_success 'deleted vs modified submodule' '
400
git submodule update -N &&
401
test_must_fail git merge test$test_count &&
402
test -n "$(git ls-files -u)" &&
403
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
404
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
405
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
403
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
404
+ ( yes "" | git mergetool both ) &&
405
+ ( yes "d" | git mergetool file11 file12 ) &&
406
( yes "r" | git mergetool submod ) &&
407
test ! -e submod &&
408
test -d submod.orig &&
@@ -416,9 +416,9 @@ test_expect_success 'deleted vs modified submodule' '
416
git submodule update -N &&
417
test_must_fail git merge test$test_count &&
418
test -n "$(git ls-files -u)" &&
419
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
420
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
421
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
419
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
420
+ ( yes "" | git mergetool both ) &&
421
+ ( yes "d" | git mergetool file11 file12 ) &&
422
( yes "l" | git mergetool submod ) &&
423
test "$(cat submod/bar)" = "master submodule" &&
424
git submodule update -N &&
@@ -440,9 +440,9 @@ test_expect_success 'file vs modified submodule' '
440
git checkout -b test$test_count.a branch1 &&
441
test_must_fail git merge master &&
442
test -n "$(git ls-files -u)" &&
443
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
444
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
445
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
443
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
444
+ ( yes "" | git mergetool both ) &&
445
+ ( yes "d" | git mergetool file11 file12 ) &&
446
( yes "r" | git mergetool submod ) &&
447
rmdir submod && mv submod-movedaside submod &&
448
test "$(cat submod/bar)" = "branch1 submodule" &&
@@ -456,9 +456,9 @@ test_expect_success 'file vs modified submodule' '
456
git checkout -b test$test_count.b test$test_count &&
457
test_must_fail git merge master &&
458
test -n "$(git ls-files -u)" &&
459
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
460
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
461
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
459
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
460
+ ( yes "" | git mergetool both ) &&
461
+ ( yes "d" | git mergetool file11 file12 ) &&
462
( yes "l" | git mergetool submod ) &&
463
git submodule update -N &&
464
test "$(cat submod)" = "not a submodule" &&
@@ -472,9 +472,9 @@ test_expect_success 'file vs modified submodule' '
472
git submodule update -N &&
473
test_must_fail git merge test$test_count &&
474
test -n "$(git ls-files -u)" &&
475
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
476
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
477
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
475
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
476
+ ( yes "" | git mergetool both ) &&
477
+ ( yes "d" | git mergetool file11 file12 ) &&
478
( yes "r" | git mergetool submod ) &&
479
test -d submod.orig &&
480
git submodule update -N &&
@@ -488,9 +488,9 @@ test_expect_success 'file vs modified submodule' '
488
git submodule update -N &&
489
test_must_fail git merge test$test_count &&
490
test -n "$(git ls-files -u)" &&
491
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
492
- ( yes "" | git mergetool both>/dev/null 2>&1 ) &&
493
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
491
+ ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
492
+ ( yes "" | git mergetool both ) &&
493
+ ( yes "d" | git mergetool file11 file12 ) &&
494
( yes "l" | git mergetool submod ) &&
495
test "$(cat submod/bar)" = "master submodule" &&
496
git submodule update -N &&
@@ -543,7 +543,7 @@ test_expect_success 'submodule in subdirectory' '
543
git add subdir/subdir_module &&
544
git commit -m "change submodule in subdirectory on test$test_count.b" &&
545
546
- test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
546
+ test_must_fail git merge test$test_count.a &&
547
(
548
cd subdir &&
549
( yes "l" | git mergetool subdir_module )
@@ -554,7 +554,7 @@ test_expect_success 'submodule in subdirectory' '
554
git reset --hard &&
555
git submodule update -N &&
556
557
- test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
557
+ test_must_fail git merge test$test_count.a &&
558
( yes "r" | git mergetool subdir/subdir_module ) &&
559
test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
560
git submodule update -N &&
@@ -641,7 +641,7 @@ test_expect_success 'filenames seen by tools start with ./' '
641
test_config mergetool.myecho.trustExitCode true &&
642
test_must_fail git merge master &&
643
git mergetool --no-prompt --tool myecho -- both >actual &&
644
- grep ^\./both_LOCAL_ actual >/dev/null
644
+ grep ^\./both_LOCAL_ actual
645
'
646
647
test_lazy_prereq MKTEMP '
@@ -658,8 +658,8 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
658
test_config mergetool.myecho.trustExitCode true &&
659
test_must_fail git merge master &&
660
git mergetool --no-prompt --tool myecho -- both >actual &&
661
- ! grep ^\./both_LOCAL_ actual >/dev/null &&
662
- grep /both_LOCAL_ actual >/dev/null
661
+ ! grep ^\./both_LOCAL_ actual &&
662
+ grep /both_LOCAL_ actual
663
'
664
665
test_expect_success 'diff.orderFile configuration is honored' '