summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-08-06 01:31:47 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-07 11:50:28 -0700
commit2a01ef8ca31ab1cb889485ba8d9a20c7ba7ab54f (patch)
treeb4220bb8abfbd3deef190ca2825065b1321820c4 /t/t6020-merge-df.sh
parenttest-lib: turn on GIT_TEST_CHAIN_LINT by default (diff)
downloadtgif-2a01ef8ca31ab1cb889485ba8d9a20c7ba7ab54f.tar.xz
test-lib: turn off "-x" tracing during chain-lint check
Now that GIT_TEST_CHAIN_LINT is on by default, running: ./t0000-basic.sh -x --verbose-only=1 starts with: expecting success: find .git/objects -type f -print >should-be-empty && test_line_count = 0 should-be-empty + exit 117 error: last command exited with $?=117 + find .git/objects -type f -print + test_line_count = 0 should-be-empty + test 3 != 3 + wc -l + test 0 = 0 ok 1 - .git/objects should be empty after git init in an empty repo This is confusing, as the "exit 117" line and the error line (which is printed in red, no less!) are not part of the test at all, but are rather in the separate chain-lint test_eval. Let's unset the "trace" variable when eval-ing the chain lint check, which avoids this. Note that we cannot just do a one-shot variable like: trace= test_eval ... as the behavior of one-shot variables for function calls is not portable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions