Skip to content

Commit

Permalink
Fix t3411.3 to actually rebase something
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed May 18, 2012
1 parent 87b5054 commit 9ef5b2b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions t/t3411-rebase-preserve-around-merges.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 9ef5b2b

Please sign in to comment.