Johannes Schindelin <johannes.schindelin@xxxxxx> writes: > -/* 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(); > } This obviously makes the assumption made by 39784cd362 ("sequencer: remove useless get_dir() function", 2016-12-07) invalid, where the "remove useless" thought that the callers of this function wants a single answer that does not depend on opts. I'll revert that commit from the sb/sequencer-abort-safety topic (as the topic is in 'next' already) to keep this one. Please holler if that is a mistaken decision. Thanks.