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

By Johannes Sixt * js/rebase-i-p-test-fix: Fix t3411.3 to actually rebase something
git-mirror · May 23, 2012 · 1221941 · 1221941
2 parents c0f31b8 + 9ef5b2b
commit 1221941
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 &&