X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft3411-rebase-preserve-around-merges.sh;h=ace8e54e9b374688751cc470eeb9003ca7f5c48f;hb=c9321a0e20f3461cf4ae07a8320aa80480107f24;hp=14a23cd8726fbb33df480133ed0466177916b7fb;hpb=fc4b10cd2dd4f23443d1c639b9c38a604fff3aa3;p=git.git diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index 14a23cd87..ace8e54e9 100755 --- a/t/t3411-rebase-preserve-around-merges.sh +++ b/t/t3411-rebase-preserve-around-merges.sh @@ -37,7 +37,7 @@ test_expect_success 'setup' ' # -- C1 -- # test_expect_success 'squash F1 into D1' ' - FAKE_LINES="1 squash 3 2" git rebase -i -p B1 && + FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 && test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" && test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" && git tag E2