Re: another git rebase -i problem

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 14, 2008, 15:39 UTC
Message-ID: <alpine.LSU.1.00.0802141537000.30505@racer.site>
In-Reply-To: <20080214130228.GB28472@digi.com>

Hi,

On Thu, 14 Feb 2008, Uwe Kleine-König wrote:

Show 18 quoted lines

> 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

Since the patches were already applied, but git (as well as you!) failed to remove them from the patch list, the user has to be asked to skip the patch.

Unfortunately, I have no time to look into this, and I do not even think that cherry-pick tells me if a patch was already applied (as opposed to a failed patch application), so I doubt that the message can be made more meaningful.

Anyway, your "problem" is that you have to say "git rebase --skip", because the patch has been applied to upstream already (but looked differently enough that the patch id was different).

Ciao, Dscho