diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-12 09:35:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 12:55:03 -0700 |
| commit | 1f2d5dc4d2bbcae87736fcd7b7c0e6542008c5f7 (patch) | |
| tree | 959c81b4e972fb9f38f8ef13e4cd6a61f702e576 | |
| parent | da1d63363f13d4d65c59564c74fd8dd598b39c49 (diff) | |
| download | git-1f2d5dc4d2bbcae87736fcd7b7c0e6542008c5f7.tar.gz | |
rebase --merge: fix reflog message after skipping
The reflog message for every pick after running "rebase --skip" looks
like
rebase (skip) (pick): commit subject line
Fix this by not appending " (skip)" to the 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 | 2 | ||||
| -rwxr-xr-x | t/t3406-rebase-message.sh | 24 |
2 files changed, 24 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 414526f83a..c1e68173b5 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1297,8 +1297,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct string_list merge_rr = STRING_LIST_INIT_DUP; options.action = "skip"; - set_reflog_action(&options); - rerere_clear(the_repository, &merge_rr); string_list_clear(&merge_rr, 1); ropts.flags = RESET_HEAD_HARD; diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 3ca2fbb0d5..8aa6a79acc 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -163,6 +163,30 @@ test_reflog () { # check there is only one new entry in the branch reflog test_cmp_rev fast-forward@{1} X ' + + test_expect_success "rebase $mode --skip reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" ' + git checkout conflicts && + test_when_finished "git reset --hard Q" && + + ( + if test -n "$reflog_action" + then + GIT_REFLOG_ACTION="$reflog_action" && + export GIT_REFLOG_ACTION + fi && + test_must_fail git rebase $mode main && + git rebase --skip + ) && + + git log -g --format=%gs -4 >actual && + write_reflog_expect <<-EOF && + ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts + ${reflog_action:-rebase} (pick): Q + ${reflog_action:-rebase} (pick): P + ${reflog_action:-rebase} (start): checkout main + EOF + test_cmp expect actual + ' } test_reflog --merge |