summaryrefslogtreecommitdiff
path: root/contrib/fast-import/import-zips.py
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2018-03-08 13:38:44 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-08 15:37:14 -0800
commitc20bf94abcf49323fdbd398c412a6cf6af3f3a61 (patch)
treef957d2e0200cff3b055cf5e884afa4df07054adf /contrib/fast-import/import-zips.py
parentt9400-git-cvsserver-server: don't rely on the output of 'test_cmp' (diff)
downloadtgif-c20bf94abcf49323fdbd398c412a6cf6af3f3a61.tar.xz
t9402-git-cvsserver-refs: don't check the stderr of a subshell
Four 'cvs diff' related tests in 't9402-git-cvsserver-refs.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 the emptiness of a subshell's stderr, which includes the trace of commands executed in that subshell as well, throwing off the emptiness check. Save the stdout and stderr of the invoked 'cvs' command instead of the whole subshell, so the latter remains free from tracing output. (Note that changing how stdout is saved is only done for the sake of consistency, it's not necessary for correctness.) After this change t9402 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>
Diffstat (limited to 'contrib/fast-import/import-zips.py')
0 files changed, 0 insertions, 0 deletions