From 878810552b42a444b2a38ccaad60d23969638f05 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 18 Jun 2018 18:19:42 -0400 Subject: t3404: check root commit in 'rebase -i --root reword root commit' When testing a reworded root commit, ensure that the squash-onto commit which is created and amended is still the root commit. Suggested-by: Phillip Wood Helped-by: Johannes Schindelin Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index e500d7c..352a52e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' ' set_fake_editor && FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ git rebase -i --root && - git show HEAD^ | grep "A changed" + git show HEAD^ | grep "A changed" && + test -z "$(git show -s --format=%p HEAD^)" ' test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' ' -- cgit v0.10.2-6-g49f6