Code

rebase --interactive: Compute upstream SHA1 before switching branches
authorJohannes Sixt <johannes.sixt@telecom.at>
Mon, 2 Jun 2008 14:01:40 +0000 (16:01 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2008 03:36:14 +0000 (20:36 -0700)
commit69e66f5500ef6079e3374a6654ef1f6df0c6f360
treedad8587f8117efcdf8cbdcce735f32a470c507a7
parentc5833f6e1373e4e6a2c31a0cb6cd9050dc395643
rebase --interactive: Compute upstream SHA1 before switching branches

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh