Merge branch 'jk/test-with-x'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:53 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:53 +0000 (14:48 -0700)
Running tests with the "-x" option to make them verbose had some
unpleasant interactions with other features of the test suite.

* jk/test-with-x:
  test-lib: disable trace when test is not verbose
  test-lib: turn off "-x" tracing during chain-lint check

1  2 
t/test-lib.sh

diff --cc t/test-lib.sh
Simple merge