From: Johannes Sixt <j6t@kdbg.org>
To: Stephen Haberman <stephen@exigencecorp.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] Fix t3411.3 to actually rebase something
Date: Fri, 18 May 2012 15:48:53 +0200 [thread overview]
Message-ID: <4FB65345.3090201@kdbg.org> (raw)
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
next reply other threads:[~2012-05-18 13:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 13:48 Johannes Sixt [this message]
2012-05-18 15:15 ` [PATCH] Fix t3411.3 to actually rebase something Stephen Haberman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB65345.3090201@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=stephen@exigencecorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).