From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 11 Apr 2015 02:12:16 +0000 (-0700)
Subject: Fix commit-msg to handle scissors lines
X-Git-Tag: emacs-25.0.90~2493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=68a74dd12ad8c28bfe6fb2c0232a7beea548c4c6;p=emacs.git

Fix commit-msg to handle scissors lines

* build-aux/git-hooks/commit-msg:
Ignore every line after a scissors line, such as a line generated
by 'git commit -v'.  Problem reported by Johan Bockgård in:
http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00580.html
---

diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 5b07b6c5d65..ea8d9098b37 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -62,7 +62,13 @@ exec $awk -v at_sign="$at_sign" -v cent_sign="$cent_sign" '
     }
   }
 
-  /^#/ { next }
+  /^#/ {
+    # Ignore every line after a scissors line.
+    if (/^# *---* *(>[8%]|[8%]<) *---* *$/) { exit }
+
+    # Ignore comment lines.
+    next
+  }
 
   !/^.*$/ {
     print "Invalid character (not UTF-8) in commit message"