summaryrefslogtreecommitdiff
path: root/build-aux/gitlog-to-changelog
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-05-07 23:10:57 -0700
committerGlenn Morris <rgm@gnu.org>2015-05-07 23:10:57 -0700
commit1bb36c5cd49978fbc2403c4f170b14f01c6f0886 (patch)
tree6a350072b7b08cdb9d27186132e043099bea32ce /build-aux/gitlog-to-changelog
parent31deb8ad1146705079b98466c56f1c05b4af2638 (diff)
downloademacs-1bb36c5cd49978fbc2403c4f170b14f01c6f0886.tar.gz
* build-aux/gitlog-to-changelog: Treat "Tiny-change" like
"Copyright-paperwork-exempt". (Bug#20324)
Diffstat (limited to 'build-aux/gitlog-to-changelog')
-rwxr-xr-xbuild-aux/gitlog-to-changelog5
1 files changed, 3 insertions, 2 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 3f4b06a4df1..ad7c2739cbc 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
if 0;
# Convert git log output to ChangeLog format.
-my $VERSION = '2015-04-09 16:03'; # UTC
+my $VERSION = '2015-05-08 06:05'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -324,7 +324,7 @@ sub git_dir_option($)
# Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
# `(tiny change)' annotation.
- my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
+ my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line)
? ' (tiny change)' : '');
my $date_line = sprintf "%s %s$tiny\n",
@@ -335,6 +335,7 @@ sub git_dir_option($)
@line = grep !/^(?:Signed-off-by:[ ].*>$
|Co-authored-by:[ ]
|Copyright-paperwork-exempt:[ ]
+ |Tiny-change:[ ]
)/x, @line;
# Remove leading and trailing blank lines.