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>
Junio C Hamano committed
Mar 16, 2008 at 00:50 UTC
e637122ef2d3911568d7d016f723cdad61730069
1 file changed
+1
-1
git-rebase.sh
+1
-1
@@ -63,7 +63,7 @@ continue_merge () {
63
cmt=`cat "$dotest/current"`
64
if ! git diff-index --quiet HEAD --
65
then
66
- if ! git-commit -C "$cmt"
66
+ if ! git commit --no-verify -C "$cmt"
67
then
68
echo "Commit failed, please do not call \"git commit\""
69
echo "directly, but instead do one of the following: "