diff options
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 21:43:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 01:08:08 +0300 |
commit | cc1453e1dadc750a2d5c68b0e053b2221d212ef6 (patch) | |
tree | 693e844c8f0bd7110a8f45597fa6cd7983e706fc | |
parent | caf038cb4ec224ce2fcc241de302a7b37f73963e (diff) |
rebase: factor out call to pre-rebase hook
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>
-rwxr-xr-x | git-rebase--interactive.sh | 14 | ||||
-rwxr-xr-x | git-rebase.sh | 12 |
2 files changed, 7 insertions, 19 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 1ba98a2c67..f94f057dff 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -109,18 +109,6 @@ commit_message () { 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" comment_for_reflog () { @@ -753,8 +741,6 @@ esac git var GIT_COMMITTER_IDENT >/dev/null || die "You need to set your committer info first" -run_pre_rebase_hook "$upstream_arg" "$@" - comment_for_reflog start if test ! -z "$switch_to" diff --git a/git-rebase.sh b/git-rebase.sh index 265f01df27..87d7fde95c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -184,7 +184,7 @@ run_interactive_rebase () { GIT_EDITOR=: export GIT_EDITOR fi - . git-rebase--interactive "$@" + . git-rebase--interactive } run_pre_rebase_hook () { @@ -513,15 +513,15 @@ orig_head=$branch 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, # everything leading up to $branch) on top of $onto # 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") -if test "$upstream" = "$onto" && test "$mb" = "$onto" && +if test "$type" != interactive && test "$upstream" = "$onto" && + test "$mb" = "$onto" && # linear history? ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null then @@ -539,6 +539,8 @@ fi # If a hook exists, give it a chance to interrupt run_pre_rebase_hook "$upstream_arg" "$@" +test "$type" = interactive && run_interactive_rebase + # 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" |