From 68a74dd12ad8c28bfe6fb2c0232a7beea548c4c6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 10 Apr 2015 19:12:16 -0700 Subject: [PATCH] Fix commit-msg to handle scissors lines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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 --- build-aux/git-hooks/commit-msg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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" -- 2.39.2