rebase --apply: respect GIT_REFLOG_ACTION
The reflog messages when finishing a rebase hard code "rebase" rather than using GIT_REFLOG_ACTION. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Oct 12, 2022 at 09:35 UTC
33f2b61ff9039247fd26d8b40db7e87e16ffe214
2 files changed
+5
-4
builtin/rebase.c
+4
-3
@@ -582,10 +582,11 @@ static int move_to_original_branch(struct rebase_options *opts)
582
if (!opts->onto)
583
BUG("move_to_original_branch without onto");
584
585
- strbuf_addf(&branch_reflog, "rebase finished: %s onto %s",
585
+ strbuf_addf(&branch_reflog, "%s finished: %s onto %s",
586
+ getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
587
opts->head_name, oid_to_hex(&opts->onto->object.oid));
587
- strbuf_addf(&head_reflog, "rebase finished: returning to %s",
588
- opts->head_name);
588
+ strbuf_addf(&head_reflog, "%s finished: returning to %s",
589
+ getenv(GIT_REFLOG_ACTION_ENVIRONMENT), opts->head_name);
590
ropts.branch = opts->head_name;
591
ropts.flags = RESET_HEAD_REFS_ONLY;
592
ropts.branch_msg = branch_reflog.buf;
t/t3406-rebase-message.sh
+1
-1
@@ -88,7 +88,7 @@ test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
88
write_reflog_expect () {
89
if test $mode = --apply
90
then
91
- sed 's/.*(finish)/rebase finished/; s/ ([^)]*)//'
91
+ sed 's/(finish)/finished/; s/ ([^)]*)//'
92
else
93
cat
94
fi >expect