Re: another git rebase -i problem
Johannes Schindelin wrote:
Show 21 quoted lines
> Hi,
>
> On Thu, 14 Feb 2008, Uwe Kleine-König wrote:
>
> > After applying the patch below, the test fails. [describes a case where
> > all patches were applied upstream already]
>
> This is by design. If no patches are to be applied, there is nothing you
> can do interactively. And git rebase -i should tell you as much:
>
> Nothing to do
>
> Maybe it should say
>
> There is nothing you can rebase interactively
>
> But I don't like that.
>
> Alternatively, git rebase -i could reset --hard to upstream, but I don't
> like that either: if I rebase -i, it is because I want to reorder/arrange
> patches. If there is no patch to be rearranged, I did something wrong.
Ah, OK this disqualifies my test case, but the problem is real:
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index e5ed745..f0499e6 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 twerp &&
+ FAKE_LINES="1 2 4 3" git rebase -i branch3
+
+'
+
test_done
Best regards
Uwe
--
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
Uwe Kleine-König <uwe.kleine-koenig@digi.com>