Re: [PATCH] rebase -i: fix rewording with --committer-date-is-author-date
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Nov 2, 2021, 21:05 UTC
- Message-ID
- <CAPig+cSWDJ-zMv4zgU4oWcqXmaaCiH+03wSzQg2O=YRHthf55A@mail.gmail.com>
- In-Reply-To
- <pull.1123.git.git.1635883844710.gitgitgadget@gmail.com>
On Tue, Nov 2, 2021 at 4:10 PM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 10 quoted lines
> 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>
Should this have a:
Reported-by: Jonas Kittner <jonas.kittner@ruhr-uni-bochum.de>
?