Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

From: Jeff King <peff@peff.net>
Date: Jul 12, 2018, 20:14 UTC
Message-ID: <20180712201454.GA6281@sigill.intra.peff.net>
In-Reply-To: <xmqqefg8w73c.fsf@gitster-ct.c.googlers.com>

On Thu, Jul 12, 2018 at 01:07:51PM -0700, Junio C Hamano wrote:

Show 13 quoted lines

> Bash may take it happily but running test with dash reveals a breakage.
> 
> This was not discovered for a long time as no tests after this test
> depended on GIT_AUTHOR_NAME to be reverted correctly back to the
> original value after this step is done.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> 
>  * We could enclose the setting and exporting inside a subshell and
>    do without the oGIT_AUTHOR_NAME temporary variable, but that
>    would interfere with the timestamp increments done by
>    test_commit, so I think doing it this way may be preferrable.

Yeah, I agree that setting/unsetting is probably more sane for this case. Though...

Show 14 quoted lines

> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 7e9f375a24..fd43443ff5 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -280,8 +280,11 @@ test_expect_success 'retain authorship w/ conflicts' '
>  	git reset --hard twerp &&
>  	test_commit a conflict a conflict-a &&
>  	git reset --hard twerp &&
> -	GIT_AUTHOR_NAME=AttributeMe \
> +	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
> +	GIT_AUTHOR_NAME=AttributeMe &&
> +	export GIT_AUTHOR_NAME &&
>  	test_commit b conflict b conflict-b &&
> +	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&

...would you want to use test_when_finished here (both for robustness, but also to make it more clear to a reader what's going on)?

It's too bad test_commit does not take arbitrary options, as you could just use --author then, side-stepping the whole thing.

-Peff