[git] GnuPG - branch, master, updated. gnupg-2.1.6-17-g4ee4b99

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  4ee4b998378edf224dbd955145604740cbfbb427 (commit)
       via  d24165bce2823c2f5dcb39b7b84c9aa00802a8ee (commit)
      from  dbf4534f49a1fe3823bd6d6d7bb4d9df863b4789 (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 4ee4b998378edf224dbd955145604740cbfbb427
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jul 23 15:01:40 2015 +0200

    doc: Document scissor line for commit logs
    
    --

diff --git a/doc/HACKING b/doc/HACKING
index f60f15d..fe33d99 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -44,6 +44,17 @@ Fix type in a comment
 The marker line here is important; without it the first line would
 appear in the ChangeLog.
 
+If you exceptionally need to have longer lines in a commit log you may
+do this after this scissor line:
+#+begin_example
+# ------------------------ >8 ------------------------
+#+end_example
+(hash, blank, 24 dashes, blank, scissor, blank, 24 dashes).
+Note that such a comment will be removed if the git commit option
+=--cleanup=scissor= is used.
+
+
+
 ** License policy
 
   GnuPG is licensed under the GPLv3+ with some files under a mixed

commit d24165bce2823c2f5dcb39b7b84c9aa00802a8ee
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 ++++++
 doc/HACKING                    | 11 +++++++++++
 2 files changed, 17 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org