another git rebase -i problem

From: Uwe Kleine-König <uwe.kleine-koenig@digi.com>
Date: Feb 14, 2008, 09:37 UTC
Message-ID: <20080214093730.GA20408@digi.com>

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