diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:44 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:08 -0800 |
| commit | cc1453e1dadc750a2d5c68b0e053b2221d212ef6 (patch) | |
| tree | 693e844c8f0bd7110a8f45597fa6cd7983e706fc /git-rebase--interactive.sh | |
| parent | caf038cb4ec224ce2fcc241de302a7b37f73963e (diff) | |
| download | git-cc1453e1dadc750a2d5c68b0e053b2221d212ef6.tar.gz git-cc1453e1dadc750a2d5c68b0e053b2221d212ef6.tar.xz | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 1ba98a2c6..f94f057df 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" |