Re: [PATCH v3 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 5, 2016, 11:35 UTC
Message-ID: <alpine.DEB.2.20.1610051325280.35196@virtualbox>
In-Reply-To: <xmqqpongt034.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Tue, 4 Oct 2016, Junio C Hamano wrote:

Show 8 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > This is the 5th last patch series of my work to accelerate interactive
> > rebases in particular on Windows.
> 
> Offtopic, but I am always confused by what you might mean by this
> "nth last patch series".  Is this series 5th from the last and we
> have four more to go?

Yes, we have four more to go:

- the patch series (called "prepare-sequencer" in my fork) preparing the
  sequencer code for the next patch series, such as revamping the parser
  for the edit script (or "todo script" as I used to say all the time, or
  "insn sheet" as sequencer calls it),

- the patch series ("sequencer-i") teaching the sequencer to parse and
  execute the commands of rebase -i's git-rebase-todo file,

- the patch series ("rebase--helper") introducing the builtin, and using
  it from rebase -i, and finally

- the patch series ("rebase-i-extra") that moves more performance critical
  bits and pieces from git-rebase--interactive.sh into the rebase--helper.

I had originally planned to stop at rebase--helper and invite other developers to join the fun of making rebase -i a true builtin, but the performance improvement was surprisingly disappointing before the rebase--helper learned to skip unnecessary picks, to verify that the script is valid, to expand/collapse the SHA-1s, and to rearrange fixup!/squash! lines.

> In any case, after a quick re-read and comparison with the last
> round, I think this is in a good shape.  I'd say that we would wait
> for a few days for others to comment and then merge it to 'next' if
> we missed nothing glaringly wrong.

Perfect! Dscho