diff options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index e61673744..6df06c400 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -400,6 +400,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 @@ -450,7 +451,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 @@ -462,6 +463,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." |