Skip to content

Commit e637122

Browse files
committed
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 <[email protected]>
1 parent 6bf4f1b commit e637122

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ continue_merge () {
6363
cmt=`cat "$dotest/current"`
6464
if ! git diff-index --quiet HEAD --
6565
then
66-
if ! git-commit -C "$cmt"
66+
if ! git commit --no-verify -C "$cmt"
6767
then
6868
echo "Commit failed, please do not call \"git commit\""
6969
echo "directly, but instead do one of the following: "

0 commit comments

Comments
 (0)