Re: Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 5, 2018, 16:28 UTC
Message-ID: <xmqqin3j6h9j.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <nycvar.QRO.7.76.6.1809050025480.71@tvgsbejvaqbjf.bet>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 14 quoted lines

> On Tue, 4 Sep 2018, Junio C Hamano wrote:
>
>> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
>> writes:
>> 
>> > +	test_must_fail git -c core.editor="grep -q ^pick" \
>> > +		rebase -ki --autosquash HEAD~4 &&
>> 
>> When merged to 'pu', this reveals that "git rebase" rewritten in C
>> knows "--keep-empty" but not "-k".
>
> I had already reported this:
>
> https://public-inbox.org/git/nycvar.QRO.7.76.6.1808241803100.73@tvgsbejvaqbjf.bet/

Good that you said there that you'll have it fixed in future updates.

I do not want to leave the project state with failing test at the tip of 'pu', and I do not want to get distracted in squashing the fix deep in large sequences of topics that we know will be rerolled once the prerelease freeze is over anyway, so in the meantime I'll queue this near the tip of 'pu' to keep the tree sane.

Thanks for eyeballing.