Re: [PATCH v2 1/3] commit: reword the empty-commit rebase errors

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 27, 2026, 16:54 UTC
Message-ID: <xmqqwltba4gt.fsf@gitster.g>
In-Reply-To: <dec05fd6-b99c-4a71-b80e-24e7d6de4b62@gmail.com>

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

Show 9 quoted lines

>> @@ -521,7 +521,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
>>   		else if (is_from_cherry_pick(whence))
>>   			die(_("cannot do a partial commit during a cherry-pick."));
>>   		else if (is_from_rebase(whence))
>> -			die(_("cannot do a partial commit during a rebase."));
>> +			die(_("cannot do a partial commit while resolving a commit that became empty."));
>
> "while committing a commit that became empty" would be clearer to me, 
> but I what you have is definitely an improvement on the existing message.

A stupid question, but wouldn't a partial commit of an empty commit still an empty commit? IOW, why do we need to reject a partial commit while committing a commit that became empty?

Thanks.