From c5b09feb786f6a2456ec3d8203d0f4d67f09f043 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 19 Dec 2007 01:41:26 -0500 Subject: [PATCH] Avoid update hook during git-rebase --interactive If we are rebasing changes that contain potential whitespace errors that our .git/hooks/pre-commit hook looks for and fails on then git-commit will fail to commit that change. This causes git-rebase--interactive to squash commits together, even though it was not requested to do so by the todo file. Passing --no-verify to git-commit makes git-rebase -i behave more like git-rebase normally would in such conditions, providing more consistent behavior between the different rebase implementations. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7153ac787..fa9c11f17 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -296,7 +296,7 @@ do_next () { GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ - $USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT + $USE_OUTPUT git commit --no-verify -F "$MSG" $EDIT_COMMIT ;; t) cp "$MSG" "$GIT_DIR"/MERGE_MSG @@ -372,7 +372,7 @@ do test ! -f "$DOTEST"/amend || git reset --soft HEAD^ } && export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE && - git commit -F "$DOTEST"/message -e + git commit --no-verify -F "$DOTEST"/message -e require_clean_work_tree do_rest -- 2.30.2