Hi, On Mon, 26 Jan 2009, Thomas Rast wrote: > Johannes Schindelin wrote: > > > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > > --- > > git-rebase--interactive.sh | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 6e2bf25..5df35b2 100755 > > --- a/git-rebase--interactive.sh > > +++ b/git-rebase--interactive.sh > > @@ -571,7 +571,8 @@ first and then run 'git rebase --continue' again." > > ;; > > --) > > shift > > - test ! -z "$REBASE_ROOT" -o $# -eq 1 -o $# -eq 2 || usage > > + test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 || > > + test ! -z "$REBASE_ROOT" -a $# -le 1 || usage > > test -d "$DOTEST" && > > die "Interactive rebase already started" > > Acked-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> > > I'll postpone 1/2 till I've had enough sleep to check whether > --continue ever needed to know about --root, and either remove or fix > the remembering. (Sorry for the noise.) It does need to remember, as pick_one wants to look at the parent to be able to fast-forward. But the sane fix is to add a file "$DOTEST"/root in case we're running under --root. 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
