Skip to content
Permalink
Browse files

rebase -i: add test for reflog message

Check that the reflog message written to the branch reflog when the
rebase is completed is correct

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
phillipwood authored and gitster committed Jun 19, 2017
1 parent cdb866b commit 1ceb9dfab7eab719ade6dc2d7e3d53b50139da1d
Showing with 7 additions and 0 deletions.
  1. +7 −0 t/t3404-rebase-interactive.sh
@@ -169,6 +169,13 @@ test_expect_success 'reflog for the branch shows state before rebase' '
test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
'

test_expect_success 'reflog for the branch shows correct finish message' '
printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
"$(git rev-parse branch2)" >expected &&
git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
test_cmp expected actual
'

test_expect_success 'exchange two commits' '
set_fake_editor &&
FAKE_LINES="2 1" git rebase -i HEAD~2 &&

0 comments on commit 1ceb9df

Please sign in to comment.
You can’t perform that action at this time.