From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Mar 2008 07:50:22 +0000 (-0700)
Subject: rebase -m: do not trigger pre-commit verification
X-Git-Tag: v1.5.5-rc0~2^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e637122ef2d3911568d7d016f723cdad61730069;p=git.git

rebase -m: do not trigger pre-commit verification

When rebasing changes that contain issues that the pre-commit hook flags
as problematic, the rebase cannot be continued.  However, rebase is about
transplanting commits that are already made with as little distortion as
possible, and pre-commit check should not interfere.

Earlier, c5b09fe (Avoid update hook during git-rebase --interactive,
2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index 6b9af962a..bc0c1c4ab 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -63,7 +63,7 @@ continue_merge () {
 	cmt=`cat "$dotest/current"`
 	if ! git diff-index --quiet HEAD --
 	then
-		if ! git-commit -C "$cmt"
+		if ! git commit --no-verify -C "$cmt"
 		then
 			echo "Commit failed, please do not call \"git commit\""
 			echo "directly, but instead do one of the following: "