| commit | 9ef5b2bd166aa390778d7dcda58714ee222d7377 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Fri, 18 May 2012 13:48:53 +0000 (18 15:48 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 May 2012 19:26:49 +0000 (18 12:26 -0700) | ||
| tree | 6a7f6270b0d054476cdb1a93ac793f05a1d28afe | treesnapshot (tar.gz zip) |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a | commitdiff |
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>
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>
| t/t3411-rebase-preserve-around-merges.sh | diffblobblamehistory |