{"thread":{"id":"30557","subject":"[PATCH] Fix t3411.3 to actually rebase something","startedAt":"2012-05-18T13:48:53Z","lastAt":"2012-05-18T15:15:32Z","messageCount":2,"participants":["Johannes Sixt","Stephen Haberman"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"191662","messageId":"4FB65345.3090201@kdbg.org","threadId":"30557","inReplyTo":null,"subject":"[PATCH] Fix t3411.3 to actually rebase something","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2012-05-18T13:48:53Z","receivedAt":"2012-05-18T13:48:53Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"The test intends to rebase a branchy history onto a later commit, but it\nforgot to reset HEAD back to an earlier commit before it set up the side\nbranches. In the end, every \"rebased\" commit was only a fast-forward and\nthe 'rebase -p' did not change the commit graph at all. Insert the missing\ncheckout that moves to an earlier commit.\n\nSigned-off-by: Johannes Sixt <j6t@kdbg.org>\n---\n Noticed while I was working on replacing 'git merge' by 'git\n cherry-pick' in the rebase -p code path.\n\n t/t3411-rebase-preserve-around-merges.sh | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/t/t3411-rebase-preserve-around-merges.sh\nb/t/t3411-rebase-preserve-around-merges.sh\nindex ace8e54..dc81bf2 100755\n--- a/t/t3411-rebase-preserve-around-merges.sh\n+++ b/t/t3411-rebase-preserve-around-merges.sh\n@@ -56,6 +56,7 @@ test_expect_success 'squash F1 into D1' '\n # And rebase G1..M1 onto E2\n\n test_expect_success 'rebase two levels of merge' '\n+\tgit checkout A1 &&\n \ttest_commit G1 &&\n \ttest_commit H1 &&\n \ttest_commit I1 &&\n-- \n1.7.10.2.529.g0c18cfd\n"},{"id":"191663","messageId":"20120518101532.0c0c9dcf@sh9","threadId":"30557","inReplyTo":"4FB65345.3090201@kdbg.org","subject":"Re: [PATCH] Fix t3411.3 to actually rebase something","fromName":"Stephen Haberman","fromEmail":"stephen@exigencecorp.com","sentAt":"2012-05-18T15:15:32Z","receivedAt":"2012-05-18T15:15:32Z","isPatch":true,"sender":{"key":"stephen@exigencecorp.com","avatar":"https://gravatar.com/avatar/23b93ad70a06ce53505f17ddba65176edbcfb6588e7a4c1a2dca04aaf0a6aff1?d=mp&s=160"},"body":"\n> The test intends to rebase a branchy history onto a later commit, but\n> it forgot to reset HEAD back to an earlier commit before it set up\n> the side branches. In the end, every \"rebased\" commit was only a\n> fast-forward and the 'rebase -p' did not change the commit graph at\n> all. Insert the missing checkout that moves to an earlier commit.\n\nMakes sense to me. Thanks, Johannes.\n\n- Stephen\n"}]}