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

rebase: factor out call to pre-rebase hook

Browse Source 
Remove the call to the pre-rebase hook from
git-rebase--interactive.sh and rely on the call in
git-rebase.sh.

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:44 -05:00 committed by Junio C Hamano
parent caf038cb4e
commit cc1453e1da
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-rebase--interactive.sh
View File

@ -109,18 +109,6 @@ commit_message () {
git cat-file commit "$1" | sed "1,/^$/d" git cat-file commit "$1" | sed "1,/^$/d"
} }
run_pre_rebase_hook () {
if test -z "$ok_to_skip_pre_rebase" &&
test -x "$GIT_DIR/hooks/pre-rebase"
then
"$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
echo >&2 "The pre-rebase hook refused to rebase."
exit 1
}
fi
}
orig_reflog_action="$GIT_REFLOG_ACTION" orig_reflog_action="$GIT_REFLOG_ACTION"
comment_for_reflog () { comment_for_reflog () {
@ -753,8 +741,6 @@ esac
git var GIT_COMMITTER_IDENT >/dev/null || git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first" die "You need to set your committer info first"
run_pre_rebase_hook "$upstream_arg" "$@"
comment_for_reflog start comment_for_reflog start
if test ! -z "$switch_to" if test ! -z "$switch_to"

12
git-rebase.sh
View File

@ -184,7 +184,7 @@ run_interactive_rebase () {
GIT_EDITOR=: GIT_EDITOR=:
export GIT_EDITOR export GIT_EDITOR
fi fi
. git-rebase--interactive "$@" . git-rebase--interactive
} }
run_pre_rebase_hook () { run_pre_rebase_hook () {
@ -513,15 +513,15 @@ orig_head=$branch
require_clean_work_tree "rebase" "Please commit or stash them." require_clean_work_tree "rebase" "Please commit or stash them."
test "$type" = interactive && run_interactive_rebase "$@"
# 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
# Check if we are already based on $onto with linear history, # Check if we are already based on $onto with linear history,
# but this should be done only when upstream and onto are the same. # but this should be done only when upstream and onto are the same
# and if this is not an interactive rebase.
mb=$(git merge-base "$onto" "$branch") mb=$(git merge-base "$onto" "$branch")
if test "$upstream" = "$onto" && test "$mb" = "$onto" && if test "$type" != interactive && test "$upstream" = "$onto" &&
test "$mb" = "$onto" &&
# linear history? # linear history?
! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null
then then
@ -539,6 +539,8 @@ fi
# If a hook exists, give it a chance to interrupt # If a hook exists, give it a chance to interrupt
run_pre_rebase_hook "$upstream_arg" "$@" run_pre_rebase_hook "$upstream_arg" "$@"
test "$type" = interactive && run_interactive_rebase
# 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"