diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-02-27 15:06:23 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 19:33:36 +0100 |
commit | 72a8d3f027a5ea04ac453583105b368cd88648cd (patch) | |
tree | 56c5a948a9ea33585c0fa0977ea1d1d7643641c0 /sequencer.h | |
parent | Git 2.44 (diff) | |
download | git-72a8d3f027a5ea04ac453583105b368cd88648cd.tar.xz git-72a8d3f027a5ea04ac453583105b368cd88648cd.zip |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 { |