summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-12-19 06:41:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-20 01:15:38 (GMT)
commitc5b09feb786f6a2456ec3d8203d0f4d67f09f043 (patch)
tree6c23d289f235a264219fe89be69bf01dff380299
parent20b178de7b20a0ebf02b8da3b4791c06fc8e3a63 (diff)
downloadgit-c5b09feb786f6a2456ec3d8203d0f4d67f09f043.zip
git-c5b09feb786f6a2456ec3d8203d0f4d67f09f043.tar.gz
git-c5b09feb786f6a2456ec3d8203d0f4d67f09f043.tar.bz2
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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase--interactive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 7153ac7..fa9c11f 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