commit-msg: Exclude diff during "git commit -v"

Stop processing the commit message text at a "diff --git" line.  Such
lines occur when the user commits with the "-v" option.  We should not
check the patch content; it will be stripped by Git anyway.

1 files changed, 4 insertions, 2 deletions

diff --git a/commit-msg b/commit-msg
index e47ec0ff00..3953b37f22 100755
--- a/commit-msg
+++ b/commit-msg
@@ -2,9 +2,11 @@
 #
 # Copy or link this file as ".git/hooks/pre-commit".
 
-# Prepare a backup message without comments.
+# Prepare a copy of the message:
+#  - strip comment lines
+#  - stop at "diff --git" (git commit -v)
 commit_msg="$GIT_DIR/COMMIT_MSG"
-grep -v '^#' "$1" > "$commit_msg"
+sed -n -e '/^#/d' -e '/^diff --git/q' -e 'p;d' "$1" > "$commit_msg"
 
 die() {
 	echo 'commit-msg hook failure' 1>&2