From: Junio C Hamano Date: Tue, 25 Aug 2015 23:09:16 +0000 (-0700) Subject: Merge branch 'jk/test-with-x' into maint X-Git-Tag: v2.5.1~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/84deb3eac542cee2542e48de31c66383fbe3fc8d Merge branch 'jk/test-with-x' into maint 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 --- 84deb3eac542cee2542e48de31c66383fbe3fc8d