diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2012-05-18 15:48:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-18 12:26:49 -0700 |
| commit | 9ef5b2bd166aa390778d7dcda58714ee222d7377 (patch) | |
| tree | 6a7f6270b0d054476cdb1a93ac793f05a1d28afe /t/t3411-rebase-preserve-around-merges.sh | |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a (diff) | |
| download | git-9ef5b2bd166aa390778d7dcda58714ee222d7377.tar.gz | |
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>
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
| -rwxr-xr-x | t/t3411-rebase-preserve-around-merges.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index 14a23cd872..fbe896f24e 100755 --- 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 && |