Re: [PATCH v2 11/34] sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 19, 2016, 17:22 UTC
Message-ID: <alpine.DEB.2.20.1612191819470.54750@virtualbox>
In-Reply-To: <xmqqd1grsn53.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Fri, 16 Dec 2016, Junio C Hamano wrote:

Show 7 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > The scripted version of the interactive rebase already does that.
> 
> Sensible.  I was wondering why this wasn't there while reviewing
> 10/34, comparing the two (this is not a suggestion to squash this
> into the previous step).

It's a bit of a historical wart, as I discovered test breakages only long after implementing the fixup/squash commands (as you may have guessed, I implemented the commands one after another, fixing things as discovered by the test suite; it took something like a month until I got the rebase--helper based rebase -i to pass t3404).

In the end, I decided not to squash this into 10/34 because it seemed to be a significant enough change to merit its own commit.

Ciao, Dscho