From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Victor Gambier <vgambier@excilys.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 1/3] t3403: fix commit authorship
Date: Tue, 10 Aug 2021 11:43:52 -0700 [thread overview]
Message-ID: <xmqq5ywddtsn.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BFFTLgtrs_m9Gp7tSRwpBnAEoArhMZhhJcuzqNS_g8sUw@mail.gmail.com> (Elijah Newren's message of "Tue, 10 Aug 2021 10:01:45 -0700")
Elijah Newren <newren@gmail.com> writes:
> On Tue, Aug 10, 2021 at 2:32 AM Phillip Wood via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> Setting GIT_AUTHOR_* when committing with --amend will only change the
>> author if we also pass --reset-author
>>
>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>> ---
>> t/t3403-rebase-skip.sh | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
>> index e26762d0b29..6365c5af2f7 100755
>> --- a/t/t3403-rebase-skip.sh
>> +++ b/t/t3403-rebase-skip.sh
>> @@ -36,7 +36,8 @@ test_expect_success setup '
>> test_tick &&
>> GIT_AUTHOR_NAME="Another Author" \
>> GIT_AUTHOR_EMAIL="another.author@example.com" \
>> - git commit --amend --no-edit -m amended-goodbye &&
>> + git commit --amend --no-edit -m amended-goodbye \
>> + --reset-author &&
>
> Makes sense...but doesn't the fact that this test worked either way
> suggest that the specifying of a special author name/email was totally
> superfluous and could just be removed? If there really was a reason
> for specifying a different name/email, then is the test faulty for not
> checking for it somewhere?
Good point. The commit tagged with amended-goodbye is later used in
some tests that ensure the author ident does not change across a
rebase. If this commit gets created without authorship customized
(i.e. before Phillip's fix), we would not catch a possible breakage
to make rebase discard the original authorship information.
But with this fix, we now can catch such a breakage.
Thanks.
next prev parent reply other threads:[~2021-08-10 18:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 9:31 [PATCH 0/3] rebase --continue: remove .git/MERGE_MSG Phillip Wood via GitGitGadget
2021-08-10 9:31 ` [PATCH 1/3] t3403: fix commit authorship Phillip Wood via GitGitGadget
2021-08-10 17:01 ` Elijah Newren
2021-08-10 18:43 ` Junio C Hamano [this message]
2021-08-12 10:04 ` Phillip Wood
2021-08-14 21:53 ` Johannes Schindelin
2021-08-15 17:36 ` Junio C Hamano
2021-08-15 20:04 ` Phillip Wood
2021-08-16 16:36 ` Junio C Hamano
2021-08-17 10:05 ` Phillip Wood
2021-08-10 9:31 ` [PATCH 2/3] rebase --apply: restore some tests Phillip Wood via GitGitGadget
2021-08-10 16:58 ` Elijah Newren
2021-08-12 10:03 ` Phillip Wood
2021-08-10 9:31 ` [PATCH 3/3] rebase --continue: remove .git/MERGE_MSG Phillip Wood via GitGitGadget
2021-08-10 17:03 ` [PATCH 0/3] " Elijah Newren
2021-08-12 13:42 ` [PATCH v2 " Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 1/3] t3403: fix commit authorship Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 2/3] rebase --apply: restore some tests Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 3/3] rebase --continue: remove .git/MERGE_MSG Phillip Wood via GitGitGadget
2021-08-13 23:01 ` Junio C Hamano
2021-08-14 20:01 ` Phillip Wood
2021-08-13 0:46 ` [PATCH v2 0/3] " Elijah Newren
2021-08-13 15:31 ` Junio C Hamano
2021-08-13 17:21 ` Elijah Newren
2021-08-14 20:02 ` Phillip Wood
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=xmqq5ywddtsn.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=vgambier@excilys.com \
/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).