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

2016-10-05 Thread Junio C Hamano
Johannes Schindelin writes: > 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

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

2016-10-05 Thread Johannes Schindelin
Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin 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.

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

2016-09-12 Thread Junio C Hamano
Johannes Schindelin 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. > -static void remove_sequencer_state(void)

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

2016-09-11 Thread Johannes Schindelin
In a couple of commits, we will teach the sequencer to handle the nitty gritty of the interactive rebase, which keeps its state in a different directory. Signed-off-by: Johannes Schindelin --- sequencer.c | 21 + 1 file changed, 13 insertions(+),