Re: [PATCH 1/3] t3403: fix commit authorship
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 10, 2021, 18:43 UTC
- Message-ID
- <xmqq5ywddtsn.fsf@gitster.g>
- In-Reply-To
- <CABPp-BFFTLgtrs_m9Gp7tSRwpBnAEoArhMZhhJcuzqNS_g8sUw@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 30 quoted lines
> 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.