summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:44 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:08 -0800
commitcc1453e1dadc750a2d5c68b0e053b2221d212ef6 (patch)
tree693e844c8f0bd7110a8f45597fa6cd7983e706fc /git-rebase.sh
parentcaf038cb4ec224ce2fcc241de302a7b37f73963e (diff)
downloadgit-cc1453e1dadc750a2d5c68b0e053b2221d212ef6.tar.gz
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.sh')
-rwxr-xr-xgit-rebase.sh12
1 files changed, 7 insertions, 5 deletions
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"