From: Jim Meyering <meyering@redhat.com>
Date: Fri, 30 Dec 2011 14:53:33 +0000 (+0100)
Subject: gitlog-to-changelog: remove a little duplication
X-Git-Tag: v0.1~1332
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1a6249781ca11e2f16b04a6a1a5ddb9eee2c9ee7;p=gnulib.git

gitlog-to-changelog: remove a little duplication

* build-aux/gitlog-to-changelog (main): Grep @lines once,
rather than twice.
---

diff --git a/ChangeLog b/ChangeLog
index fe9696674..e61be47eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ee1ac87a6..8d6bc7b70 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)