From 0ef1689f914462d778c5e279dfc48702fecbabbf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Mar 2016 14:56:35 -0700 Subject: [PATCH] gitlog-to-changelog: suppress ignored chatter * build-aux/gitlog-to-changelog: Do not warn about skipping an SHA if it would have been ignored anyway. --- ChangeLog | 6 ++++++ build-aux/gitlog-to-changelog | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2be308c1f..74e0906f93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-03-22 Paul Eggert + + gitlog-to-changelog: suppress ignored chatter + * build-aux/gitlog-to-changelog: Do not warn about skipping + an SHA if it would have been ignored anyway. + 2016-03-22 Geert Janssens setlocale: add "sv" to Windows language table diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index a2513d0efc..83bafdffa6 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" "$@"' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2016-01-12 23:09'; # UTC +my $VERSION = '2016-03-22 21:49'; # 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 @@ -298,9 +298,7 @@ sub git_dir_option($) { if ($sha =~ /^$_/) { - $skipflag = 1; - ## Perhaps only warn if a pattern matches more than once? - warn "$ME: warning: skipping $sha due to $_\n"; + $skipflag = $_; last; } } @@ -386,8 +384,17 @@ sub git_dir_option($) } # Ignore commits that match the --ignore-matching pattern, if specified. - if (! ($skipflag || (defined $ignore_matching - && @line && $line[0] =~ /$ignore_matching/))) + if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/) + { + $skipflag = 1; + } + elsif ($skipflag) + { + ## Perhaps only warn if a pattern matches more than once? + warn "$ME: warning: skipping $sha due to $skipflag\n"; + } + + if (! $skipflag) { if (defined $ignore_line && @line) { -- 2.39.5