From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2015 21:48:53 +0000 (-0700)
Subject: Merge branch 'jk/test-with-x'
X-Git-Tag: v2.6.0-rc0~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138014c3cf56c15fbc28915806125d8e27a610c7;p=thirdparty%2Fgit.git

Merge branch 'jk/test-with-x'

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
---

138014c3cf56c15fbc28915806125d8e27a610c7