Skip to content

Commit 8788105

Browse files
tmzullingergitster
authored andcommitted
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 <[email protected]> Helped-by: Johannes Schindelin <[email protected]> Signed-off-by: Todd Zullinger <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76fda6e commit 8788105

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' '
977977
set_fake_editor &&
978978
FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
979979
git rebase -i --root &&
980-
git show HEAD^ | grep "A changed"
980+
git show HEAD^ | grep "A changed" &&
981+
test -z "$(git show -s --format=%p HEAD^)"
981982
'
982983

983984
test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '

0 commit comments

Comments
 (0)