From 72a8d3f027a5ea04ac453583105b368cd88648cd Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 27 Feb 2024 14:06:23 +0000 Subject: rebase -i: stop setting GIT_CHERRY_PICK_HELP Setting this environment variable causes the sequencer to display a custom message when it stops for the user to resolve conflicts and remove CHERRY_PICK_HEAD. Setting it in "git rebase" is a vestige of the scripted implementation, now that it is a builtin command we do not need to communicate with the sequencer machinery via environment variables. Move the conflicts advice to use when rebasing into sequencer.c so we do not need to pass it via the environment. Note that we retain the changes in e4301f73fff (sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands, 2024-02-02) just in case GIT_CHERRY_PICK_HELP is set in the environment when "git rebase" is run. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- sequencer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sequencer.h') diff --git a/sequencer.h b/sequencer.h index dcef7bb99c..437eabd38a 100644 --- a/sequencer.h +++ b/sequencer.h @@ -14,6 +14,8 @@ const char *rebase_path_todo(void); const char *rebase_path_todo_backup(void); const char *rebase_path_dropped(void); +extern const char *rebase_resolvemsg; + #define APPEND_SIGNOFF_DEDUP (1u << 0) enum replay_action { -- cgit v1.3-5-g9baa