From: Johannes Schindelin <johannes.schindelin@xxxxxx> The presence of this path will be used in the next commit to fix an incorrect piece of advice in `git commit` when in the middle of a rebase. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- sequencer.c | 4 ++-- sequencer.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 9d5964fd81..5bd7e9d05a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -47,7 +47,7 @@ static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts") static GIT_PATH_FUNC(git_path_head_file, "sequencer/head") static GIT_PATH_FUNC(git_path_abort_safety_file, "sequencer/abort-safety") -static GIT_PATH_FUNC(rebase_path, "rebase-merge") +GIT_PATH_FUNC(git_path_rebase_merge_dir, "rebase-merge") /* * The file containing rebase commands, comments, and empty lines. * This file is created by "git rebase -i" then edited by the user. As @@ -218,7 +218,7 @@ static inline int is_rebase_i(const struct replay_opts *opts) static const char *get_dir(const struct replay_opts *opts) { if (is_rebase_i(opts)) - return rebase_path(); + return git_path_rebase_merge_dir(); return git_path_seq_dir(); } diff --git a/sequencer.h b/sequencer.h index 574260f621..505852d7d1 100644 --- a/sequencer.h +++ b/sequencer.h @@ -9,6 +9,7 @@ struct repository; const char *git_path_commit_editmsg(void); const char *git_path_seq_dir(void); +const char *git_path_rebase_merge_dir(void); const char *rebase_path_todo(void); const char *rebase_path_todo_backup(void); -- gitgitgadget