diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | build-aux/gitlog-to-changelog | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2015-05-07 Glenn Morris <rgm@gnu.org> + + gitlog-to-changelog: parse "Tiny-change" + * build-aux/gitlog-to-changelog: Treat "Tiny-change" like + "Copyright-paperwork-exempt". (Bug#20324) + 2015-05-06 Pádraig Brady <P@draigBrady.com> doc: document glibc posix_fallocate() issues diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 3f4b06a4df..ad7c2739cb 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. |