Re: [PATCH v2 3/3] test-lib.sh: support -x option for shell-tracing

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 13, 2014, 22:38 UTC
Message-ID: <xmqq8ukj1toi.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20141013223303.GA17045@peff.net>

Jeff King <peff@peff.net> writes:

Show 21 quoted lines

> This fixes it:
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 4dab575..059bb25 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -528,8 +528,7 @@ maybe_setup_valgrind () {
>  test_eval_inner_ () {
>  	eval "
>  		test \"$trace\" = t && set -x
> -		$*
> -	"
> +		$*"
>  }
>  
>  test_eval_ () {
>
>
> My patch definitely expands the snippet with an extra trailing newline.
> But what I really don't understand is why that would impact the
> _contents_ of the config file.

Ahh, OK.  The inside of eval begins with

	cat >.git/config <<\EOF
        ...

and ends with "<HT>EOF", which is _ignored_ because it is not "EOF" alone on a line, so the shell takes everything, i.e. including the additional LF your dq. No wonder we got one extra line.

And with that additional LF fixed, even if we do not fix t1308, it should work (with some definition of "work") as before.

Thanks, that clears it up.