From d24165bce2823c2f5dcb39b7b84c9aa00802a8ee Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Thu, 9 Jul 2015 17:11:33 +0200
Subject: [PATCH] build: ignore scissor line for the commit-msg hook

* build-aux/git-hooks/commit-msg: Stop processing more lines when the
  scissor line is encountered.
--
This allows the command `git commit -v` to work even if the code is
longer than 72 characters. Note that comments are already ignored by the
previous line.

Signed-off-by: Peter Wu <peter@lekensteyn.nl>
---
 build-aux/git-hooks/commit-msg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 5a697c7a6..3ca918b27 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -86,11 +86,17 @@ sub check_msg($$)
   2 <= @line && length $line[1]
     and return 'second line must be empty';
 
+  # See git-commit(1), this is the --cleanup=scissors option. Everything
+  # after and including this line gets ignored.
+  my $marker = '# ------------------------ >8 ------------------------';
+
   # Limit line length to allow for the ChangeLog's leading TAB.
   foreach my $line (@line)
     {
       72 < length $line && $line =~ /^[^#]/
         and return 'line longer than 72 characters';
+
+      last if $line eq $marker;
     }
 
   return '';