diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | build-aux/gitlog-to-changelog | 7 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2011-12-30 Jim Meyering <meyering@redhat.com> + + gitlog-to-changelog: remove a little duplication + * build-aux/gitlog-to-changelog (main): Grep @lines once, + rather than twice. + 2011-12-29 Pádraig Brady <P@draigBrady.com> canonicalize: add support for not resolving symlinks diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index ee1ac87a67..8d6bc7b701 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 = '2011-12-24 18:51'; # UTC +my $VERSION = '2011-12-30 14:31'; # 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 @@ -253,8 +253,9 @@ sub parse_amend_file($) my @coauthors = grep /^Co-authored-by:.*$/, @line; # Omit "Co-authored-by..." and "Signed-off-by..." lines. - @line = grep !/^Signed-off-by: .*>$/, @line; - @line = grep !/^Co-authored-by: /, @line; + @line = grep !/^(?:Signed-off-by:[ ].*>$ + |Co-authored-by:[ ] + )/x, @line; # Remove leading and trailing blank lines. if (@line) |