summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2018-02-24 00:39:47 +0100
committerJunio C Hamano <gitster@pobox.com>2018-02-28 12:57:51 -0800
commit91538d0cde9101599c0df0b7f01894edf0fd8e6b (patch)
treec7a40305977efce2b7304512f05808a803897179 /Documentation/git-mergetool--lib.txt
parent9b2ac68f2763cf07dd969473c9eb06ab2f746ca6 (diff)
downloadgit-91538d0cde9101599c0df0b7f01894edf0fd8e6b.tar.gz
t5570-git-daemon: don't check the stderr of a subshell
The test 'no-op fetch without "-v" is quiet' in 't5570-git-daemon.sh' fails when the test script is run with '-x' tracing (and using a shell other than a Bash version supporting BASH_XTRACEFD). The reason for the failure is that the test checks 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 stderr of 'git fetch' only instead of the whole subshell's, so it remains free from tracing output. After this change t5570 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 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions