From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 02 Jun 2008 15:29:17 GMT
Subject: Re: [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches
Message-ID: <alpine.DEB.1.00.0806021628260.13507@racer.site.net>
In-Reply-To: <4843FD44.90905@viscovery.net>

Hi,

On Mon, 2 Jun 2008, Johannes Sixt wrote:

> From: Johannes Sixt <johannes.sixt@telecom.at>
> 
> If the upstream argument to rebase (the first argument) was relative to
> HEAD and the name of the branch to rebase (the second argument) was given,
> the upstream would have been interpreted relative to the second argument.
> In particular, this command
> 
>     git rebase -i HEAD topic
> 
> would always finish with "Nothing to do". (a1bf91e fixed the same issue
> for non-interactive rebase.)
> 
> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>

Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>

> I made this with -U5 so that you can see the checkout in the context.
> 
> BTW, methinks, this checkout is unnecessary, since before the rebase 
> begins, there is a 'git checkout $ONTO', and the branch switching is 
> certainly not needed to compute the todo list...

It is needed to determine which branch to update after finish.

Ciao,
Dscho