summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2018-02-24 00:39:43 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 12:43:14 -0800
commitc3a44562431515210197b1344d7285be2763e8f5 (patch)
tree6398769cb7f47fb8460296c6505fa9aa5dc843a6 /t/t3308-notes-merge.sh
parentt: add means to disable '-x' tracing for individual test scripts (diff)
downloadtgif-c3a44562431515210197b1344d7285be2763e8f5.tar.xz
t1507-rev-parse-upstream: don't check the stderr of a shell function
Three tests in 't1507-rev-parse-upstream.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 stderr of the function 'error_message', which includes the trace of commands executed in that function as well, throwing off the comparison with the expected output. Save stderr of 'git rev-parse' only instead of the whole function, so it remains free from tracing output. After this change t1507 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 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions