[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gitlog-to-changelog: suppress ignored chatter
From: |
Paul Eggert |
Subject: |
[PATCH] gitlog-to-changelog: suppress ignored chatter |
Date: |
Tue, 22 Mar 2016 14:57:14 -0700 |
* 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 e2be308..74e0906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-22 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
setlocale: add "sv" to Windows language table
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index a2513d0..83bafdf 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.5.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] gitlog-to-changelog: suppress ignored chatter,
Paul Eggert <=