mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
da1d63363f
commit
1f2d5dc4d2
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue