Merge branch 'js/rebase-i-p-test-fix'

By Johannes Sixt
* js/rebase-i-p-test-fix:
Fix t3411.3 to actually rebase something

diff --combined t/t3411-rebase-preserve-around-merges.sh
index ace8e54e9b374688751cc470eeb9003ca7f5c48f,fbe896f24ec30c0e612e739d9479ae7c3cc0022d..dc81bf27eb736d32df0f0c3205de3254898d20b5
--- 1/t/t3411-rebase-preserve-around-merges.sh
--- 2/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@@ -37,7 -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
@@@ -56,6 -56,7 +56,7 @@@
  # And rebase G1..M1 onto E2
  
  test_expect_success 'rebase two levels of merge' '
+       git checkout A1 &&
        test_commit G1 &&
        test_commit H1 &&
        test_commit I1 &&