diff options
author | Elijah Newren <newren@gmail.com> | 2020-04-07 16:59:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-07 15:10:11 -0700 |
commit | 1f6965f994f8fe2fca80e17b5dbb293d05716be9 (patch) | |
tree | cccb52adc6474e0811e5f11fc6e6133fdbd209ba /t/t6027-merge-binary.sh | |
parent | Git 2.26 (diff) | |
download | tgif-1f6965f994f8fe2fca80e17b5dbb293d05716be9.tar.xz |
sequencer: honor GIT_REFLOG_ACTION
There is a lot of code to honor GIT_REFLOG_ACTION throughout git,
including some in sequencer.c; unfortunately, reflog_message() and its
callers ignored it. Instruct reflog_message() to check the existing
environment variable, and use it when present as an override to
action_name().
Also restructure pick_commits() to only temporarily modify
GIT_REFLOG_ACTION for a short duration and then restore the old value,
so that when we do this setting within a loop we do not keep adding "
(pick)" substrings and end up with a reflog message of the form
rebase (pick) (pick) (pick) (finish): returning to refs/heads/master
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6027-merge-binary.sh')
0 files changed, 0 insertions, 0 deletions