Re: fz/rebase-msg-update (2023-02-27)

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 7, 2023, 21:52 UTC
Message-ID: <xmqqa60ow7nr.fsf@gitster.g>
In-Reply-To: <37ed877d5927c7cebba7e47769be3a069eacd6c6.camel@fangyi.io>

Fangyi Zhou <me@fangyi.io> writes:

Show 23 quoted lines

> On Tue, 2023-03-07 at 13:09 -0800, Junio C Hamano wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>> 
>> > Fangyi Zhou <me@fangyi.io> writes:
>> > 
>> > > This patch is actually a hotfix for a topic added in v2.40.0 RC
>> > > 2c6e5b32aa (Merge branch 'en/rebase-incompatible-opts', 2023-02-
>> > > 03),
>> > > could it be reviewed and included in the release?
>> > 
>> > Is it?  
>> > 
>> > If a message used to say autoSquash 2.39 series and 2.40-rc2
>> > has it autosquash, then it may be a hotfix, but otherwise no.
>> 
>> Besides, localizaiton teams are already working on what has been
>> in 'master'; it disrupts their workflow to change end-user message
>> under them.
>
> The patch fixes a newly added i18n string, not the option itself,
> see
> https://github.com/git-l10n/pot-changes/blob/pot/main/2023-02-04.diff
> I found the issue while conducting the localisation for v2.40.0.

Exactly.  That's not a regression.