Merge branch 'mz/rebase-no-mbox'

diff --git a/git-rebase.sh b/git-rebase.sh
index 6bd8eae6480033b353d1d86403fc9f2067d8e502..5bddfa9690e8dfbedd07e31dc7e768b60f156213 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -414,6 +414,7 @@ else
        test -z "$onto" && die "You must specify --onto when using --root"
        unset upstream_name
        unset upstream
+       test $# -gt 1 && usage
        upstream_arg=--root
 fi
 
@@ -464,7 +465,7 @@ case "$#" in
                die "fatal: no such branch: $1"
        fi
        ;;
-*)
+0)
        # Do not need to switch branches, we are already on it.
        if branch_name=`git symbolic-ref -q HEAD`
        then
@@ -476,6 +477,9 @@ case "$#" in
        fi
        orig_head=$(git rev-parse --verify "${branch_name}^0") || exit
        ;;
+*)
+       die "BUG: unexpected number of arguments left to parse"
+       ;;
 esac
 
 require_clean_work_tree "rebase" "Please commit or stash them."