Merge branch 'kk/maint-commit-tree' into maint

diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
index ace8e54e9b374688751cc470eeb9003ca7f5c48f..dc81bf27eb736d32df0f0c3205de3254898d20b5 100755 (executable)
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@ -56,6 +56,7 @@ test_expect_success 'squash F1 into D1' '
 # 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 &&