Re: [PATCH v2 04/25] sequencer: future-proof remove_sequencer_state()

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

Hi Junio,

On Mon, 12 Sep 2016, Junio C Hamano wrote:

Show 9 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > +static const char *get_dir(const struct replay_opts *opts)
> > +{
> > +	return git_path_seq_dir();
> > +}
> 
> Presumably this is what "In a couple of commits" meant, i.e. opts
> will be used soonish.

Exactly. The sequencer code was taught to use a state directory different from rebase -i's (even if it quite clearly imitated rebase -i's approach), to allow for rebase -i to run at the same time as the sequencer (by calling it via cherry-pick).

So we need to be able to use different seq_dir locations, depending on the mode we are running in.

I briefly considered consolidating them and using .git/rebase-merge/ as state directory also for cherry-pick/revert, but that would cause problems: I am surely not the only user who cherry-picks commits manually while running interactive rebases.

Ciao, Dscho