summaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-11-29 10:13:46 +0100
committerWerner Koch <wk@gnupg.org>2016-11-29 10:13:46 +0100
commitecc126a7cef371e3b88e65715ba37fb77e92ea0f (patch)
treeb2e0c47cb6e0d961da915c087664b3e9a9f63d9f /build-aux
parenttests: Add test for the ssh key export. (diff)
downloadgnupg2-ecc126a7cef371e3b88e65715ba37fb77e92ea0f.tar.xz
gnupg2-ecc126a7cef371e3b88e65715ba37fb77e92ea0f.zip
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@gnupg.org>
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/gitlog-to-changelog5
1 files changed, 2 insertions, 3 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 5cf071f67..24a3d72ce 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)