From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Pablo Sabater <pabloosabaterr@gmail.com>,
git@vger.kernel.org, cat@malon.dev, ps@pks.im,
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 10:24:02 +0100 [thread overview]
Message-ID: <56beb82a-9d6b-45d9-b795-c66e945c03db@gmail.com> (raw)
In-Reply-To: <xmqq4ijbsn2m.fsf@gitster.g>
On 09/06/2026 17:20, Junio C Hamano wrote:
> Phillip Wood <phillip.wood123@gmail.com> writes:
>
>> Hi Pablo
>>
>> On 09/06/2026 11:42, Pablo Sabater wrote:
>>> static int commit_tree_ext(struct repository *repo,
>>> @@ -135,6 +136,13 @@ static int commit_tree_ext(struct repository *repo,
>>> original_body, action, &commit_message);
>>> if (ret < 0)
>>> goto out;
>>> +
>>> + if (flags & COMMIT_TREE_ABORT_ON_SAME_MESSAGE &&
>>> + !strcmp(original_body, commit_message.buf)) {
>>> + fprintf(stderr, _("Message unchanged, aborting reword.\n"));
>>> + ret = 1;
>>> + goto out;
>>> + }
>>
>> 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.
>>
>> Aborting when the message and committer identity are unchanged seems
>> like a good idea.
>
> I am not sure why it would be a good idea. The user wanted to make
> the commit have this message, and the commit ended up having the
> same message as the user gave. That message may have been identical
> to what the commit originally had, or it may be different. Why is
> the former an abort-worthy event? A simple note, I may understand,
> but aborting with an error message?
What I really meant was skipping rewriting history makes sense, I don't
have a strong opinion on the exit code. My feeling is that some kind of
message saying we haven't rewritten anything probably a good idea.
Thanks
Phillip
prev parent reply other threads:[~2026-06-10 9:24 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
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 [this message]
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=56beb82a-9d6b-45d9-b795-c66e945c03db@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=ben.knoble@gmail.com \
--cc=cat@malon.dev \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=pabloosabaterr@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--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