Skip to content

pr-git-1123/phillipwood/wip/rebase-committer-date-is-author-date-fix-reword-v1

pr-git-1123/phillipwood/wip/rebase-committer-date-is-author-date-fix-reword-v1: rebase -i: fix rewording with --committer-date-is-author-date
tagged this 02 Nov 20:10 
From: Phillip Wood <phillip.wood@dunelm.org.uk>

baf8ec8d3a (rebase -r: don't write .git/MERGE_MSG when
fast-forwarding, 2021-08-20) stopped reading the author script in
run_git_commit() when rewording a commit. This is normally safe
because "git commit --amend" preserves the authorship. However if the
user passes "--committer-date-is-author-date" then we need to read the
author date from the author script when rewording. Fix this regression
by tightening the check for when it is safe to skip reading the author
script.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>

Submitted-As: https://lore.kernel.org/git/pull.1123.git.git.1635883844710.gitgitgadget@gmail.com
Assets 2