From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: Pablo Sabater <pabloosabaterr@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
git@vger.kernel.org, cat@malon.dev, kaartic.sivaraam@gmail.com,
ben.knoble@gmail.com
Subject: Re: [PATCH RFC v2 2/2] builtin/history: abort reword on same message
Date: Wed, 10 Jun 2026 09:02:34 -0700 [thread overview]
Message-ID: <xmqq33yuxu1x.fsf@gitster.g> (raw)
In-Reply-To: <aikMLBCC9Rc7q9S7@pks.im> (Patrick Steinhardt's message of "Wed, 10 Jun 2026 09:03:08 +0200")
Patrick Steinhardt <ps@pks.im> writes:
> On Tue, Jun 09, 2026 at 12:17:51PM -0700, Junio C Hamano wrote:
>> Pablo Sabater <pabloosabaterr@gmail.com> writes:
>>
>> >> > I wonder if we should check that the committer identity is unchanged as
>> >> > well in case anyone is using this to fix commits after committing with
>> >> > the wrong identity.
>> >
>> > I think that if you reword a commit committed by someone else but end
>> > up with no changes I want it to be kept as it was.
>>
>> That depends on the reason why the feature to "reword" the commit is
>> being used, and the use case Phillip is talking about is a bit
>> different.
>
> So the answer is "it depends". Maybe we should do handle this the same
> as git-commit(1) does with its "--reset-author" flag?
Interesting. I was mostly focusing on the committer identity, but
the same argument of courese also applies to the author identity.
Having said that, if the user who used to commit others' patches
under a wrong identity (i.e., the only thing incorrect about these
commits is the committer identity, and author identity of them are
not to be updated), "--reset-author" would not be usable, as they
want to keep the authorship information recorded. I think
(1) in the shorter term, always create a new commit by default even
if the only difference were the committer timestamp. But add a
mechanism to allow users to tell the tool to skip the update
in such a case.
(2) at a big version bump, flip the default, making the "always
create a new commit" an optional feature.
would be the way to go, and the way to trigger that mechanism needs
to be separate from "--reset-author".
Thanks.
next prev parent reply other threads:[~2026-06-10 16:02 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-07 20:07 [PATCH RFC 0/2] builtin/history: change git history reword behavior and feedback Pablo Sabater
2026-06-07 20:07 ` [PATCH RFC 1/2] builtin/history: abort reword on unchanged message Pablo Sabater
2026-06-08 9:30 ` Patrick Steinhardt
2026-06-08 10:52 ` Pablo Sabater
2026-06-08 12:16 ` Junio C Hamano
2026-06-08 16:44 ` Ben Knoble
2026-06-09 10:03 ` Pablo Sabater
2026-06-09 10:14 ` Pablo Sabater
2026-06-09 10:30 ` Kristoffer Haugsbakk
2026-06-09 13:21 ` Junio C Hamano
2026-06-09 15:51 ` Pablo Sabater
2026-06-08 16:37 ` Ben Knoble
2026-06-09 9:59 ` Pablo Sabater
2026-06-07 20:07 ` [PATCH RFC 2/2] builtin/history: print feedback after successful reword Pablo Sabater
2026-06-08 9:30 ` Patrick Steinhardt
2026-06-08 10:45 ` Pablo Sabater
2026-06-08 12:16 ` Junio C Hamano
2026-06-08 13:23 ` Pablo Sabater
2026-06-08 16:47 ` Ben Knoble
2026-06-09 10:42 ` [PATCH RFC v2 0/2] builtin/history: abort reword on same message Pablo Sabater
2026-06-09 10:42 ` [PATCH RFC v2 1/2] builtin/history: refactor function signature Pablo Sabater
2026-06-09 10:42 ` [PATCH RFC v2 2/2] builtin/history: abort reword on same message Pablo Sabater
2026-06-09 13:25 ` Phillip Wood
2026-06-09 16:20 ` Junio C Hamano
2026-06-09 17:12 ` Pablo Sabater
2026-06-09 19:17 ` Junio C Hamano
2026-06-10 7:03 ` Patrick Steinhardt
2026-06-10 9:33 ` Phillip Wood
2026-06-10 16:02 ` Junio C Hamano [this message]
2026-06-09 18:02 ` Justin Tobler
2026-06-09 19:30 ` Junio C Hamano
2026-06-09 20:14 ` Justin Tobler
2026-06-10 9:24 ` Phillip Wood
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=xmqq33yuxu1x.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ben.knoble@gmail.com \
--cc=cat@malon.dev \
--cc=git@vger.kernel.org \
--cc=kaartic.sivaraam@gmail.com \
--cc=pabloosabaterr@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
/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