From: Phillip Wood <phillip.wood123@gmail.com>
Date: Tue, 02 Nov 2021 21:29:27 GMT
Subject: Re: [PATCH] rebase -i: fix rewording with --committer-date-is-author-date
Message-ID: <349c1832-41b2-863d-254c-777e1915fea8@gmail.com>
In-Reply-To: <CAPig+cSWDJ-zMv4zgU4oWcqXmaaCiH+03wSzQg2O=YRHthf55A@mail.gmail.com>

Hi Eric

On 02/11/2021 21:05, Eric Sunshine wrote:
> On Tue, Nov 2, 2021 at 4:10 PM Phillip Wood via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>> 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>

Yes it should and does locally but I forgot to push the updated version.

Thanks

Phillip

> ?
>