diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-12 11:35:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 21:55:03 +0200 |
| commit | 33f2b61ff9039247fd26d8b40db7e87e16ffe214 (patch) | |
| tree | bdd1e0788daff64094d8882ad75ee5c2def59e31 | |
| parent | rebase --merge: fix reflog message after skipping (diff) | |
| download | git-33f2b61ff9039247fd26d8b40db7e87e16ffe214.tar.xz git-33f2b61ff9039247fd26d8b40db7e87e16ffe214.zip | |
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>
| -rw-r--r-- | builtin/rebase.c | 7 | ||||
| -rwxr-xr-x | t/t3406-rebase-message.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index c1e68173b5..ea246c6bb3 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -582,10 +582,11 @@ static int move_to_original_branch(struct rebase_options *opts) if (!opts->onto) BUG("move_to_original_branch without onto"); - strbuf_addf(&branch_reflog, "rebase finished: %s onto %s", + strbuf_addf(&branch_reflog, "%s finished: %s onto %s", + getenv(GIT_REFLOG_ACTION_ENVIRONMENT), opts->head_name, oid_to_hex(&opts->onto->object.oid)); - strbuf_addf(&head_reflog, "rebase finished: returning to %s", - opts->head_name); + strbuf_addf(&head_reflog, "%s finished: returning to %s", + getenv(GIT_REFLOG_ACTION_ENVIRONMENT), opts->head_name); ropts.branch = opts->head_name; ropts.flags = RESET_HEAD_REFS_ONLY; ropts.branch_msg = branch_reflog.buf; diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 8aa6a79acc..bb2a4949ab 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -88,7 +88,7 @@ test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' ' write_reflog_expect () { if test $mode = --apply then - sed 's/.*(finish)/rebase finished/; s/ ([^)]*)//' + sed 's/(finish)/finished/; s/ ([^)]*)//' else cat fi >expect |