Re: [PATCH 01/34] sequencer: support a new action: 'interactive rebase'
From: Kevin Daudt <hidden>
Date: 2016-09-02 21:13:38
On Wed, Aug 31, 2016 at 10:54:02AM +0200, Johannes Schindelin wrote:
quoted hunk ↗ jump to hunk
@@ -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.