From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function
Date: Thu, 12 Jul 2018 13:22:55 -0700 [thread overview]
Message-ID: <xmqq4lh4w6e8.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180712201454.GA6281@sigill.intra.peff.net> (Jeff King's message of "Thu, 12 Jul 2018 16:14:54 -0400")
Jeff King <peff@peff.net> writes:
> On Thu, Jul 12, 2018 at 01:07:51PM -0700, Junio C Hamano wrote:
>
>> 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...
>
>> 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)?
Perhaps.
I wish our test-lint caught "VAR=VAL shellfunc", but it is rather
hard to do so, I would imagine.
next prev parent reply other threads:[~2018-07-12 20:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 20:07 [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function Junio C Hamano
2018-07-12 20:14 ` Jeff King
2018-07-12 20:22 ` Junio C Hamano [this message]
2018-07-12 20:31 ` Junio C Hamano
2018-07-12 23:51 ` Jeff King
2018-07-13 5:55 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4lh4w6e8.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).