[git] GnuPG - branch, master, updated. gnupg-2.1.16-27-gecc126a

[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  ecc126a7cef371e3b88e65715ba37fb77e92ea0f (commit)
      from  47b8b9e2ce5af7fba117ae0b00e10bec414dcfb0 (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 ecc126a7cef371e3b88e65715ba37fb77e92ea0f
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Nov 29 10:13:46 2016 +0100

    build: Remove more keywords from the generated ChangeLog
    
    * build-aux/gitlog-to-changelog (parse_amend_file): Generalize keyword
    removal.
    --
    
    This simplified rule does now match most special keywords like
      Signed-off-by:
      GnuPG-bug-id:
      Fixes-commit:
    However it does not match the sometimes used
      Fixes:
    which should be avoided anyway.
    
    This patch helps in cases where the "--" delimiter line was not used
    and only keywords were given.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 5cf071f..24a3d72 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -294,9 +294,8 @@ sub parse_amend_file($)
       $prev_date_line = $date_line;
       @prev_coauthors = @coauthors;
 
-      # Omit "Co-authored-by..." and "Signed-off-by..." lines.
-      @line = grep !/^Signed-off-by: .*>$/, @line;
-      @line = grep !/^Co-authored-by: /, @line;
+      # Omit keyword lines like "Signed-off-by:" or "GnuPG-bug-id:"
+      @line = grep !/^[A-Z][A-Za-z]+-[a-z-]+: /, @line;
 
       # Remove everything after a line with 2 dashes at the beginning.
       if ($tear_off)

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

Summary of changes:
 build-aux/gitlog-to-changelog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


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