rebase: factor out reference parsing

diff --git a/git-rebase.sh b/git-rebase.sh
index 4a83d1042672184fcdcefbac1d99a9bfb46160f2..0f5f5fb206e74d996eb096aea7833708bdccb71c 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -431,8 +431,6 @@ else
        state_dir="$apply_dir"
 fi
 
-test "$type" = interactive && run_interactive_rebase "$@"
-
 if test -z "$rebase_root"
 then
        # The upstream head must be given.  Make sure it is valid.
@@ -443,7 +441,7 @@ then
        unset root_flag
        upstream_arg="$upstream_name"
 else
-       test -z "$onto" && die "--root must be used with --onto"
+       test -z "$onto" && die "You must specify --onto when using --root"
        unset upstream_name
        unset upstream
        root_flag="--root"
@@ -470,7 +468,8 @@ case "$onto_name" in
        fi
        ;;
 *)
-       onto=$(git rev-parse --verify "${onto_name}^0") || exit
+       onto=$(git rev-parse --verify "${onto_name}^0") ||
+       die "Does not point to a valid commit: $1"
        ;;
 esac
 
@@ -512,6 +511,8 @@ case "$#" in
 esac
 orig_head=$branch
 
+test "$type" = interactive && run_interactive_rebase "$@"
+
 require_clean_work_tree "rebase" "Please commit or stash them."
 
 # Now we are rebasing commits $upstream..$branch (or with --root,