From: Jim Meyering <meyering@redhat.com>
Date: Sun, 20 Nov 2011 14:34:59 +0000 (+0100)
Subject: maint: avoid gitlog-to-changelog diagnostic about unused entries
X-Git-Tag: v8.15~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ffc159611db3443282aee42465afc8a1597519c;p=thirdparty%2Fcoreutils.git

maint: avoid gitlog-to-changelog diagnostic about unused entries

* build-aux/git-log-fix: Comment out two unused entries.
Each of those two entries does indicate an error in a commit log,
but precedes the cut-off date, so has an actual VC'd ChangeLog entry.
I.e., gitlog-to-changelog generates ChangeLog entries since 2008-02,
and these two predate that.
* ChangeLog-2008: Make the indicated correction.
---

diff --git a/ChangeLog-2008 b/ChangeLog-2008
index 58faa4450a..9f16cc4398 100644
--- a/ChangeLog-2008
+++ b/ChangeLog-2008
@@ -104,7 +104,7 @@
 	(errno_may_be_empty, ignorable_failure): New functions.
 	* src/remove.c (is_empty_dir): Move function to ...
 	* src/system.h (is_empty_dir): ...here, and make it inline.
-	Suggested by Josselin Mouette in <http://bugs.debian.org/363011>
+	Suggested by Josselin Mouette in <http://bugs.debian.org/350541>
 	via Bob Proulx.
 	* NEWS: Mention the improvement.
 
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index 5a30b89c08..8e5346315e 100644
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -14,16 +14,20 @@ s,seq:,factor:,
 # correct the URL
 s,<http.+?>,<http://bugs.debian.org/412688>,
 
-ed5c4e770a27862813c0182be8680abeb005d15b
-# Wrong bug ID:
-s,/363011,/350541,
-# in this:
-# Suggested by Josselin Mouette in <http://bugs.debian.org/363011>
+# This is wrong now only in the git log.  The ChangeLog-2008
+# entry was also erroneous, but has been corrected.
+# ed5c4e770a27862813c0182be8680abeb005d15b
+# # Wrong bug ID:
+# s,/363011,/350541,
+# # in this:
+# # Suggested by Josselin Mouette in <http://bugs.debian.org/363011>
 
-1379ed974f1fa39b12e2ffab18b3f7a607082202
-# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
-# Change the author to be Paul.  Note the escaped "@":
-s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
+# This was wrong only in the git log.  The ChangeLog entry was
+# is from 2007, and so was recorded (correctly) in ChangeLog-2007.
+# 1379ed974f1fa39b12e2ffab18b3f7a607082202
+# # Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
+# # Change the author to be Paul.  Note the escaped "@":
+# s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
 
 209850fd7e1e89cf8937310878bd22d70e3588a5
 s/isspace/isblank/