From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 26 Jan 2009 00:44:15 GMT
Subject: Re: [PATCH 1/2] rebase -i --root: simplify code
Message-ID: <alpine.DEB.1.00.0901260143540.14855@racer>
In-Reply-To: <200901260049.25563.trast@student.ethz.ch>

Hi,

On Mon, 26 Jan 2009, Thomas Rast wrote:

> Johannes Schindelin wrote:
> > 
> > When we rebase with --root, what we are actually picking are the commits
> > in $ONTO..$HEAD.  So $ONTO is really our $UPSTREAM.  Spell it out.
> [...]
> > +			UPSTREAM=$ONTO
> 
> While I think the simplification is reasonable, it breaks this check:
> 
>   get_saved_options () {
>   # ...
>           test ! -s "$DOTEST"/upstream && REBASE_ROOT=t
>   }
> 
> So you'll have to change that too.

Will fix tomorrow.

Thanks,
Dscho