diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | build-aux/gitlog-to-changelog | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2015-03-20 Paul Eggert <eggert@cs.ucla.edu> + gitlog-to-changelog: trim trailing white space + * build-aux/gitlog-to-changelog (main): + Trim trailing white space from commit message lines. + This is helpful for processing the GNU Emacs repository, + which dates back to 1985 and contains a lot of such lines. + gitlog-to-changelog: new option --ignore-matching * build-aux/gitlog-to-changelog (usage, git_dir_option, main): Support new option --ignore-matching=PAT, which ignores all diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 747353a5c5..4fa4f29702 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-03-20 22:09'; # UTC +my $VERSION = '2015-03-21 01:01'; # 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 @@ -314,7 +314,7 @@ sub git_dir_option($) $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; } - my @line = split "\n", $rest; + my @line = split /\s*\n/, $rest; my $author_line = shift @line; defined $author_line or die "$ME:$.: unexpected EOF\n"; |