rebase -i --root: fix check for number of arguments
If we are not rebasing with --root, then $# can only be either 1 (base) or 2 (base and the name of the branch to be rebased). If we are rebasing with --root, then it is Ok if $# is 0 (rebase the current branch down to everything) or 1 (rebase the named branch down to everything). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 26, 2009 at 00:32 UTC
277d7e91ae6afbe1b7aa7496320d43fd3f59f7ec
1 file changed
+2
-1
git-rebase--interactive.sh
+2
-1
@@ -571,7 +571,8 @@ first and then run 'git rebase --continue' again."
571
;;
572
--)
573
shift
574
- test ! -z "$REBASE_ROOT" -o $# -eq 1 -o $# -eq 2 || usage
574
+ test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 ||
575
+ test ! -z "$REBASE_ROOT" -a $# -le 1 || usage
576
test -d "$DOTEST" &&
577
die "Interactive rebase already started"
578