Hi Kevin,
On Fri, 2 Sep 2016, Kevin Daudt wrote:
> On Wed, Aug 31, 2016 at 10:54:02AM +0200, Johannes Schindelin wrote:
> > @@ -43,16 +51,20 @@ static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
> > /* We will introduce the 'interactive rebase' mode later */
> > static inline int is_rebase_i(const struct replay_opts *opts)
> > {
> > - return 0;
> > + return opts->action == REPLAY_INTERACTIVE_REBASE;
> > }
> >
> > static const char *get_dir(const struct replay_opts *opts)
> > {
> > + if (is_rebase_i(opts))
> > + return rebase_path();
> > return git_path_seq_dir();
> > }
> >
> > static const char *get_todo_path(const struct replay_opts *opts)
> > {
> > + if (is_rebase_i(opts))
> > + return rebase_path_todo();
> > return git_path_todo_file();
> > }
>
> This patch fails to apply for me because function is_rebase_i has never
> been introduced before (no record of it anywhere). Currently, only
> IS_REBASE_I macro is present.
I did not send out a new iteration of the prepare-sequencer patch series
(mostly because I wanted reviewers to look at the later patch series,
rather than re-review a 2nd iteration of something they already saw).
But I did address the concerns mentioned in the review already, of course,
because part of the reason to show those patch series was to get valuable
feedback before including the work in Git for Windows v2.10.0.
You can find the current iteration of the prepare-sequencer here:
https://github.com/dscho/git/compare/libify-sequencer...prepare-sequencer
Please note that I will most likely try to address some l10n concerns
before sending out the next iteration of the patch series.
The patch introducing is_rebase_i() (and no longer IS_REBASE_I()) is:
https://github.com/dscho/git/commit/76d272020bb72618957308f06083c807efe59aca
If you want to have the latest iteration of the entire patch thicket, just
`git fetch https://github.com/dscho/git interactive-rebase`. I update that
more frequently than I send out updates via mail.
Ciao,
Johannes