undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: reorder validation steps

Browse Source 
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>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:41 -05:00 committed by Junio C Hamano
parent f3889b8401
commit 8f9bfb64c5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -792,12 +792,12 @@ else
test -z "$onto" && test -z "$onto" &&
die "You must specify --onto when using --root" die "You must specify --onto when using --root"
fi fi
require_clean_work_tree "rebase" "Please commit or stash them."
run_pre_rebase_hook "$upstream_arg" "$@" run_pre_rebase_hook "$upstream_arg" "$@"
comment_for_reflog start comment_for_reflog start
require_clean_work_tree "rebase" "Please commit or stash them."
if test ! -z "$1" if test ! -z "$1"
then then
output git checkout "$1" -- || output git checkout "$1" -- ||

10
git-rebase.sh
View File

@ -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" if test -z "$rebase_root"
then then
# The upstream head must be given. Make sure it is valid. # 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 # If the branch to rebase is given, that is the branch we will rebase
# $branch_name -- branch being rebased, or HEAD (already detached) # $branch_name -- branch being rebased, or HEAD (already detached)
# $orig_head -- commit object name of tip of the branch before rebasing # $orig_head -- commit object name of tip of the branch before rebasing
@ -517,6 +512,8 @@ case "$#" in
esac esac
orig_head=$branch orig_head=$branch
require_clean_work_tree "rebase" "Please commit or stash them."
# Now we are rebasing commits $upstream..$branch (or with --root, # Now we are rebasing commits $upstream..$branch (or with --root,
# everything leading up to $branch) on top of $onto # 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 # Detach HEAD and reset the tree
say "First, rewinding head to replay your work on top of it..." say "First, rewinding head to replay your work on top of it..."
git checkout -q "$onto^0" || die "could not detach HEAD" git checkout -q "$onto^0" || die "could not detach HEAD"