* [PATCH] Fix t3411.3 to actually rebase something
@ 2012-05-18 13:48 Johannes Sixt
2012-05-18 15:15 ` Stephen Haberman
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Sixt @ 2012-05-18 13:48 UTC (permalink / raw)
To: Stephen Haberman; +Cc: Git Mailing List
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>
---
Noticed while I was working on replacing 'git merge' by 'git
cherry-pick' in the rebase -p code path.
t/t3411-rebase-preserve-around-merges.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/t/t3411-rebase-preserve-around-merges.sh
b/t/t3411-rebase-preserve-around-merges.sh
index ace8e54..dc81bf2 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 &&
--
1.7.10.2.529.g0c18cfd
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix t3411.3 to actually rebase something
2012-05-18 13:48 [PATCH] Fix t3411.3 to actually rebase something Johannes Sixt
@ 2012-05-18 15:15 ` Stephen Haberman
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Haberman @ 2012-05-18 15:15 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Git Mailing List
> 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.
Makes sense to me. Thanks, Johannes.
- Stephen
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-18 15:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-18 13:48 [PATCH] Fix t3411.3 to actually rebase something Johannes Sixt
2012-05-18 15:15 ` Stephen Haberman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).