build: Remove more keywords from the generated ChangeLog
authorWerner Koch <wk@gnupg.org>
Tue, 29 Nov 2016 09:13:46 +0000 (10:13 +0100)
committerWerner Koch <wk@gnupg.org>
Tue, 29 Nov 2016 09:13:46 +0000 (10:13 +0100)
* 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@gnupg.org>
build-aux/gitlog-to-changelog

index 5cf071f..24a3d72 100755 (executable)
@@ -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)