]> git.ipfire.org Git - thirdparty/git.git/commit
rebase -i: stop setting GIT_CHERRY_PICK_HELP
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 27 Feb 2024 14:06:23 +0000 (14:06 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2024 18:33:36 +0000 (10:33 -0800)
commit72a8d3f027a5ea04ac453583105b368cd88648cd
tree56c5a948a9ea33585c0fa0977ea1d1d7643641c0
parent3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0
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>
builtin/rebase.c
sequencer.c
sequencer.h