Fix t3411.3 to actually rebase something
The test intends to rebase a branchy history onto a later commit, but it forgot to reset HEAD back to an earlier commit before it set up the side branches. In the end, every "rebased" commit was only a fast-forward and the 'rebase -p' did not change the commit graph at all. Insert the missing checkout that moves to an earlier commit. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
May 18, 2012 at 15:48 UTC
9ef5b2bd166aa390778d7dcda58714ee222d7377
1 file changed
+1
t/t3411-rebase-preserve-around-merges.sh
+1
@@ -56,6 +56,7 @@ test_expect_success 'squash F1 into D1' '
56
# And rebase G1..M1 onto E2
57
58
test_expect_success 'rebase two levels of merge' '
59
+ git checkout A1 &&
60
test_commit G1 &&
61
test_commit H1 &&
62
test_commit I1 &&