Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx> --- t/t3404-rebase-interactive.sh | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) The current version of git fails this test. I think it's a bug, because the patch is what I expect to happen. Or am I wrong? diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 62e65d7..05f3828 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -213,6 +213,26 @@ test_expect_success 'preserve merges with -p' ' test $(git show HEAD~2:file1) = B ' +# This test uses to-be-preserved from the test 'preserve merges with -p' +test_expect_success 'squash and preserve merges' ' + test_tick && + git checkout -b squash-and-preserve-merges master && + echo A > file1 && + git commit -m SaPM-1 file1 && + echo B > file1 && + git commit -m SaPM-2 file1 && + git merge to-be-preserved && + echo C > file1 && + git commit -m SaPM-3 file1 && + + EXPECT_COUNT=4 FAKE_LINES="1 2 squash 4 3" \ + git rebase -i -p --onto branch1 master && + test $(git rev-parse HEAD^2) = $(git rev-parse to-be-preserved) && + test $(git rev-parse HEAD~3) = $(git rev-parse branch1) && + test $(git show HEAD:file1) = C && + test $(git show HEAD~2:file1) = A +' + test_expect_success '--continue tries to commit' ' test_tick && ! git rebase -i --onto new-branch1 HEAD^ && -- 1.5.4.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
