rebase: reorder validation steps

Reorder validation steps in preparation for the validation to be factored
out from git-rebase--interactive.sh into git-rebase.sh.

The main functional difference is that the pre-rebase hook will no longer
be run if the work tree is dirty.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4f4fb29a49f1b3440cb60fca68f4ad91916522b0..0f04f36eba091653f53511acd4c6d978d074c5c6 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -792,12 +792,12 @@ else
        test -z "$onto" &&
                die "You must specify --onto when using --root"
 fi
        test -z "$onto" &&
                die "You must specify --onto when using --root"
 fi

+require_clean_work_tree "rebase" "Please commit or stash them."
+

 run_pre_rebase_hook "$upstream_arg" "$@"
 
 comment_for_reflog start
 
 run_pre_rebase_hook "$upstream_arg" "$@"
 
 comment_for_reflog start
 

-require_clean_work_tree "rebase" "Please commit or stash them."
-

 if test ! -z "$1"
 then
        output git checkout "$1" -- ||
 if test ! -z "$1"
 then
        output git checkout "$1" -- ||

diff --git a/git-rebase.sh b/git-rebase.sh
index aa1bcaf07f61f70dc650667dd73c295b5207dcfc..4a83d1042672184fcdcefbac1d99a9bfb46160f2 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -433,8 +433,6 @@ fi
 
 test "$type" = interactive && run_interactive_rebase "$@"
 
 
 test "$type" = interactive && run_interactive_rebase "$@"
 

-require_clean_work_tree "rebase" "Please commit or stash them."
-

 if test -z "$rebase_root"
 then
        # The upstream head must be given.  Make sure it is valid.
 if test -z "$rebase_root"
 then
        # The upstream head must be given.  Make sure it is valid.


@@ -476,9 +474,6 @@ case "$onto_name" in
        ;;
 esac
 
        ;;
 esac
 

-# If a hook exists, give it a chance to interrupt
-run_pre_rebase_hook "$upstream_arg" "$@"
-

 # If the branch to rebase is given, that is the branch we will rebase
 # $branch_name -- branch being rebased, or HEAD (already detached)
 # $orig_head -- commit object name of tip of the branch before rebasing
 # If the branch to rebase is given, that is the branch we will rebase
 # $branch_name -- branch being rebased, or HEAD (already detached)
 # $orig_head -- commit object name of tip of the branch before rebasing


@@ -517,6 +512,8 @@ case "$#" in
 esac
 orig_head=$branch
 
 esac
 orig_head=$branch
 

+require_clean_work_tree "rebase" "Please commit or stash them."
+

 # Now we are rebasing commits $upstream..$branch (or with --root,
 # everything leading up to $branch) on top of $onto
 
 # Now we are rebasing commits $upstream..$branch (or with --root,
 # everything leading up to $branch) on top of $onto
 


@@ -538,6 +535,9 @@ then
        fi
 fi
 
        fi
 fi
 

+# If a hook exists, give it a chance to interrupt
+run_pre_rebase_hook "$upstream_arg" "$@"
+

 # Detach HEAD and reset the tree
 say "First, rewinding head to replay your work on top of it..."
 git checkout -q "$onto^0" || die "could not detach HEAD"
 # Detach HEAD and reset the tree
 say "First, rewinding head to replay your work on top of it..."
 git checkout -q "$onto^0" || die "could not detach HEAD"