summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rwxr-xr-xbuild-aux/gitlog-to-changelog2
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7eca2c4bdc..81a532692d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-09-24 Pavel Raiskup <praiskup@redhat.com>
+
+ gitlog-to-changelog: trim only trailing whitespaces
+ This is fix for --format regression introduced by commit
+ 2b93079a5d1baa4d; it caused that --format='%s%n%n%b%n' (see the
+ doubled %n string) had no effect anymore. This format
+ specification has been used e.g. by GNU paxuitils (commit
+ edfd8bcc3).
+
+ * build-aux/gitlog-to-changelog (main): Stop squashing multiple
+ newlines in commmit messages.
+
2015-09-23 Paul Eggert <eggert@cs.ucla.edu>
Test that c_iscntrl agrees with iscntrl, etc.
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 0cab1bf17c..a0e0a05df8 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -333,7 +333,7 @@ sub git_dir_option($)
$rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
}
- my @line = split /\s*\n/, $rest;
+ my @line = split /[ \t]*\n/, $rest;
my $author_line = shift @line;
defined $author_line
or die "$ME:$.: unexpected EOF\n";