From: Phillip Wood <phillip.wood123@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Jonas Kittner <jonas.kittner@ruhr-uni-bochum.de>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] rebase -i: fix rewording with --committer-date-is-author-date
Date: Tue, 2 Nov 2021 21:29:27 +0000 [thread overview]
Message-ID: <349c1832-41b2-863d-254c-777e1915fea8@gmail.com> (raw)
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
> ?
>
next prev parent reply other threads:[~2021-11-02 21:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 20:10 [PATCH] rebase -i: fix rewording with --committer-date-is-author-date Phillip Wood via GitGitGadget
2021-11-02 21:05 ` Eric Sunshine
2021-11-02 21:29 ` Phillip Wood [this message]
2021-11-02 21:30 ` [PATCH v2] " Phillip Wood via GitGitGadget
2021-11-02 22:32 ` [PATCH] " Jeff King
2021-11-03 11:23 ` Phillip Wood
2021-11-03 11:42 ` Jeff King
2021-11-03 17:44 ` Junio C Hamano
2021-11-04 2:03 ` Jeff King
2021-11-04 6:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=349c1832-41b2-863d-254c-777e1915fea8@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jonas.kittner@ruhr-uni-bochum.de \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).