[git] GPGME - branch, master, updated. gpgme-1.5.5-3-g157c8be

[by Peter Wu]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  157c8be183153ff588f98874a3205aa483d0fd23 (commit)
      from  c23f8897105ce2bb6e62d9c44ca0779fcc08a919 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 157c8be183153ff588f98874a3205aa483d0fd23
Author: Peter Wu <peter at lekensteyn.nl>
Date:   Thu Jul 9 17:11:33 2015 +0200

    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 at lekensteyn.nl>

diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 5a697c7..3ca918b 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 '';

-----------------------------------------------------------------------

Summary of changes:
 build-aux/git-hooks/commit-msg | 6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org