diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-01-26 00:32:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-25 22:06:50 -0800 |
| commit | 277d7e91ae6afbe1b7aa7496320d43fd3f59f7ec (patch) | |
| tree | a66c313470be1336b135814641d12500579201cd | |
| parent | gittutorial: remove misleading note (diff) | |
| download | tgif-277d7e91ae6afbe1b7aa7496320d43fd3f59f7ec.tar.xz | |
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>
| -rwxr-xr-x | 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 21ac20c305..002929eb09 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" |