Re: [PATCH 1/2] rebase -i --root: simplify code

From

Thomas Rast <trast@student.ethz.ch>

Date

Jan 25, 2009, 23:49 UTC

Message-ID

<200901260049.25563.trast@student.ethz.ch>

In-Reply-To

<alpine.DEB.1.00.0901260031460.14855@racer>

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.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch