t5500-fetch-pack: don't check the stderr of a subshell
Three "missing reference" tests in 't5500-fetch-pack.sh' fail when the test script is run with '-x' tracing (and using a shell other than a Bash version supporting BASH_XTRACEFD). The reason for those failures is that the tests check a subshell's stderr, which includes the trace of executing commands in that subshell as well, throwing off the comparison with the expected output. Save the stderr of 'git fetch-pack' only instead of the whole subshell, so it remains free from tracing output. After this change t5500 passes with '-x', even when running with /bin/sh. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Feb 24, 2018 at 00:39 UTC
fa06eb6fa906f0b6e44046fe7b077d71ebb4d6e4
1 file changed
+6
-6
t/t5500-fetch-pack.sh
+6
-6
@@ -482,24 +482,24 @@ test_expect_success 'set up tests of missing reference' '
482
test_expect_success 'test lonely missing ref' '
483
(
484
cd client &&
485
- test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy
486
- ) >/dev/null 2>error-m &&
485
+ test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
486
+ ) &&
487
test_i18ncmp expect-error error-m
488
'
489
490
test_expect_success 'test missing ref after existing' '
491
(
492
cd client &&
493
- test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy
494
- ) >/dev/null 2>error-em &&
493
+ test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
494
+ ) &&
495
test_i18ncmp expect-error error-em
496
'
497
498
test_expect_success 'test missing ref before existing' '
499
(
500
cd client &&
501
- test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A
502
- ) >/dev/null 2>error-me &&
501
+ test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
502
+ ) &&
503
test_i18ncmp expect-error error-me
504
'
505