Re: [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Mon, 2 Jun 2008, Johannes Sixt wrote:

> From: Johannes Sixt <johannes.sixt@xxxxxxxxxx>
> 
> 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@xxxxxxxxxx>

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

> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux