summaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-02-24 02:48:36 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-25 13:51:47 -0800
commit43f3afc6bc6b79715ea46aaf341683cbba6ee965 (patch)
tree38ed78537c001e7d16b322fa80640043a428175b /mergetools/bc3
parenttest_must_fail: report number of unexpected signal (diff)
downloadtgif-43f3afc6bc6b79715ea46aaf341683cbba6ee965.tar.xz
t5504: handle expected output from SIGPIPE death
Commit 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27) taught t5504 to handle "git push" racily exiting with SIGPIPE rather than failing. However, one of the tests checks the output of the command, as well. In the SIGPIPE case, we will not have produced any output. If we want the test to be truly non-flaky, we have to accept either output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions