From: "Uwe Kleine-König" <Uwe.Kleine-Koenig@digi.com>
To: git@vger.kernel.org
Subject: another git rebase -i problem
Date: Thu, 14 Feb 2008 10:37:30 +0100 [thread overview]
Message-ID: <20080214093730.GA20408@digi.com> (raw)
Hello,
this time it's more trivial, so maybe PEBKAC.
After applying the patch below, the test fails. git rebase (without -i)
works.
The relevant history looks as follows:
F - I+H+G+G - ... <- branch3
\
I
And moreover I have a more complicated history here with git rebase
failing but I think this here is not my problem :-(
Best regards
Uwe
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index e5ed745..4d2dec7 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -362,4 +362,11 @@ test_expect_success 'rebase with a file named HEAD in worktree' '
'
+test_expect_success 'rebase patch already merged' '
+
+ git checkout -b branch4 I &&
+ git rebase -i branch3
+
+'
+
test_done
--
1.5.4.1
--
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
next reply other threads:[~2008-02-14 9:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-14 9:37 Uwe Kleine-König [this message]
2008-02-14 12:35 ` another git rebase -i problem Johannes Schindelin
2008-02-14 13:02 ` Uwe Kleine-König
2008-02-14 15:39 ` Johannes Schindelin
2008-02-15 8:10 ` Uwe Kleine-König
2008-02-15 9:21 ` Uwe Kleine-König
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=20080214093730.GA20408@digi.com \
--to=uwe.kleine-koenig@digi.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.