Skip to content

Commit 118ee5c

Browse files
phillipwoodgitster
authored andcommitted
t3403: fix commit authorship
Setting GIT_AUTHOR_* when committing with --amend will only change the author if we also pass --reset-author. This commit is used in some tests that ensure the author ident does not change when rebasing. Creating this commit without changing the authorship meant that the test would not catch regressions that caused rebase to discard the original authorship information. Signed-off-by: Phillip Wood <[email protected]> Reviewed-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ebf3c04 commit 118ee5c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t3403-rebase-skip.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ test_expect_success setup '
3636
test_tick &&
3737
GIT_AUTHOR_NAME="Another Author" \
3838
GIT_AUTHOR_EMAIL="[email protected]" \
39-
git commit --amend --no-edit -m amended-goodbye &&
39+
git commit --amend --no-edit -m amended-goodbye \
40+
--reset-author &&
4041
test_tick &&
4142
git tag amended-goodbye &&
4243

0 commit comments

Comments
 (0)