rebase -i: execute hook only after argument checking

Previously, the pre-rebase-hook would be launched before we knew if
the <upstream> [<branch>] arguments were supplied.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c8b0861c085035c85002f6e2fe969369ea32016f..2c668cd81acdff723963163aee82ceb6289b45a7 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -554,7 +554,6 @@ first and then run 'git rebase --continue' again."
                ;;
        --)
                shift
                ;;
        --)
                shift

-               run_pre_rebase_hook ${1+"$@"}

                test $# -eq 1 -o $# -eq 2 || usage
                test -d "$DOTEST" &&
                        die "Interactive rebase already started"
                test $# -eq 1 -o $# -eq 2 || usage
                test -d "$DOTEST" &&
                        die "Interactive rebase already started"


@@ -562,11 +561,13 @@ first and then run 'git rebase --continue' again."
                git var GIT_COMMITTER_IDENT >/dev/null ||
                        die "You need to set your committer info first"
 
                git var GIT_COMMITTER_IDENT >/dev/null ||
                        die "You need to set your committer info first"
 

+               UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
+               run_pre_rebase_hook ${1+"$@"}
+

                comment_for_reflog start
 
                require_clean_work_tree
 
                comment_for_reflog start
 
                require_clean_work_tree
 

-               UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"

                test -z "$ONTO" && ONTO=$UPSTREAM
 
                if test ! -z "$2"
                test -z "$ONTO" && ONTO=$UPSTREAM
 
                if test ! -z "$2"