From: Jay Soffian <jaysoffian@gmail.com>
Date: Wed, 18 Feb 2009 13:23:15 GMT
Subject: Re: [PATCH] disallow providing multiple upstream branches to rebase, pull --rebase
Message-ID: <76718490902180523l6df2067bxc1274a105756d16b@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0902181118160.6274@intel-tinevez-2-302>

On Wed, Feb 18, 2009 at 5:18 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>> diff --git a/git-rebase.sh b/git-rebase.sh
>> index 5d9a393..ffb6027 100755
>> --- a/git-rebase.sh
>> +++ b/git-rebase.sh
>> @@ -319,6 +319,7 @@ do
>>       esac
>>       shift
>>  done
>> +test $# -gt 1 && usage
>
> Did you just break
>
>        $ git rebase $UPSTREAM $BRANCH_TO_SWITCH_TO

Crap, I missed that usage somehow (and I guess the test suite doesn't
rely on it either...). I think moving the "test $# -gt 1 && usage"
below:

if test -z "$rebase_root"
then
	# The upstream head must be given.  Make sure it is valid.
	upstream_name="$1"
	shift
	upstream=`git rev-parse --verify "${upstream_name}^0"` ||
	die "invalid upstream $upstream_name"
	unset root_flag
	upstream_arg="$upstream_name"
else
	test -z "$newbase" && die "--root must be used with --onto"
	unset upstream_name
	unset upstream
	root_flag="--root"
	upstream_arg="$root_flag"
fi

will do the trick, yes?

j.