From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 18 Jan 2012 08:45:01 +0000 (+0100)
Subject: gitlog-to-changelog: update from upstream
X-Git-Tag: v1.11.2b~3^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a9862a89875f9060f95547b6fd4274c86738617;p=platform%2Fupstream%2Fautomake.git

gitlog-to-changelog: update from upstream

* lib/gitlog-to-changelog: Update from gnulib upstream.  The only
changes should be cosmetic and/or minor fixlets.
---

diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 61edde1e3..38c6f3aaa 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/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 = '2012-01-17 21:54'; # UTC
+my $VERSION = '2012-01-18 07:50'; # 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
@@ -194,7 +194,7 @@ sub parse_amend_file($)
   my $format_string = '%s%n%b%n';
   my $amend_file;
   my $append_dot = 0;
-  my $no_cluster = 0;
+  my $cluster = 1;
   GetOptions
     (
      help => sub { usage 0 },
@@ -203,7 +203,7 @@ sub parse_amend_file($)
      'format=s' => \$format_string,
      'amend=s' => \$amend_file,
      'append-dot' => \$append_dot,
-     'no-cluster' => \$no_cluster,
+     'cluster!' => \$cluster,
     ) or usage 1;
 
 
@@ -312,11 +312,11 @@ sub parse_amend_file($)
       # would be different from the previous date/name/email/coauthors header,
       # or if this or the previous entry consists of two or more paragraphs,
       # then print the header.
-      if ($no_cluster
-          or $date_line ne $prev_date_line
-          or "@coauthors" ne "@prev_coauthors"
-          or $multi_paragraph
-          or $prev_multi_paragraph)
+      if ( ! $cluster
+          || $date_line ne $prev_date_line
+          || "@coauthors" ne "@prev_coauthors"
+          || $multi_paragraph
+          || $prev_multi_paragraph)
         {
           $prev_date_line eq ''
             or print "\n";