From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: William Hubbs <williamh@gentoo.org>
Cc: git@vger.kernel.org, chutzpah@gentoo.org
Subject: Re: [PATCH v2 2/2] tests: add test for separate author and committer idents
Date: Sat, 26 Jan 2019 09:53:18 +0100 [thread overview]
Message-ID: <874l9v4x6p.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20190126010632.GA4000@whubbs1.gaikai.biz>
On Sat, Jan 26 2019, William Hubbs wrote:
> On Sat, Jan 26, 2019 at 12:05:08AM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Fri, Jan 25 2019, William Hubbs wrote:
>
> ...
>
>> > + sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
>> > + sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
>>
>> Fine, but FYI sets these variables for the rest of the test.
>
> I'm not quite sure what you mean by this. I want the environment
> variables to be *unset*. I don't want them to override anything in the
> config file for this test.
>
> Are you saying they will not be set for the test unless I set them,
> so I don't need the SANE_UNSET calls?
Sorry for not being clear. I just meant that unlike "test_config" the
"sane_unset" function won't reset the state at the end of the
"test_expect_success".
Right now it doesn't matter in practice since this is the last test
before "test_done", but as tests are added we tend to leak state between
them, which is why we use these "unset at the end" helper functions.
But unlike with config that doesn't matter in this case, since we want
these unset anyway.
Which, looking at this again, you'd only want if a previous test in the
file was leaking its state. That's not the case, so this isn't needed
and you can just apply this on top:
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 06c7c0fb78..e5845b0b86 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -87,8 +87,6 @@ test_expect_success REBASE_P \
test_expect_success \
'author and committer config settings override user config settings' '
- sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
- sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
git config user.name user &&
git config user.email user@example.com &&
git config author.name author &&
You don't need to be paranoid and unset these, we already unset GIT_*
variables that aren't on a whitelist in test-lib.sh, see 'A call to
"unset"' there.
next prev parent reply other threads:[~2019-01-26 8:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 21:59 Add author and committer configuration settings William Hubbs
2019-01-25 21:59 ` [PATCH v2 1/2] config: allow giving separate author and committer idents William Hubbs
2019-01-25 22:58 ` Ævar Arnfjörð Bjarmason
2019-01-28 18:58 ` William Hubbs
2019-01-28 19:00 ` Junio C Hamano
2019-01-28 20:04 ` Ævar Arnfjörð Bjarmason
2019-01-28 21:33 ` Junio C Hamano
2019-01-28 23:30 ` William Hubbs
2019-01-29 22:42 ` William Hubbs
2019-01-25 21:59 ` [PATCH v2 2/2] tests: add test for " William Hubbs
2019-01-25 23:05 ` Ævar Arnfjörð Bjarmason
2019-01-26 1:06 ` William Hubbs
2019-01-26 8:53 ` Ævar Arnfjörð Bjarmason [this message]
2019-01-27 4:48 ` Eric Sunshine
2019-01-28 19:05 ` Ævar Arnfjörð Bjarmason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874l9v4x6p.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=chutzpah@gentoo.org \
--cc=git@vger.kernel.org \
--cc=williamh@gentoo.org \
/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.
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 NNTP newsgroup(s).