Re: [PATCH RFC v2 2/2] builtin/history: abort reword on same message

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 9, 2026, 16:20 UTC
Message-ID: <xmqq4ijbsn2m.fsf@gitster.g>
In-Reply-To: <54bd36e9-3d21-4f83-86d6-2882a14779de@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

Show 22 quoted lines

> 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?

Thanks.