Hi Phillip, On Thu, 12 Aug 2021, Phillip Wood wrote: > On 10/08/2021 19:43, Junio C Hamano wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > > > > On Tue, Aug 10, 2021 at 2:32 AM Phillip Wood via GitGitGadget > > > <gitgitgadget@xxxxxxxxx> wrote: > > > > > > > > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > > > > > > > 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@xxxxxxxxxxxxx> > > > > --- > > > > 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@xxxxxxxxxxx" \ > > > > - 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. > > I'll expand the commit message to make that clear Maybe you could even add a `test another.author@xxxxxxxxxxx = $(git show -s --format=%ae HEAD)`? Ciao, Dscho
