From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:36 +0000 (-0700)
Subject: Merge branch 'jk/test-send-sh-x-trace-elsewhere'
X-Git-Tag: v2.9.0-rc0~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=372731810e06ce69c4752e27f0f4ed7f64b2019c;p=git

Merge branch 'jk/test-send-sh-x-trace-elsewhere'

Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in.  When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.

* jk/test-send-sh-x-trace-elsewhere:
  test-lib: set BASH_XTRACEFD automatically
---

372731810e06ce69c4752e27f0f4ed7f64b2019c