[PATCH] maint: fix git-log typos when generating ChangeLog

[Jim Meyering]

Finally, this makes it so we can correct errors in git commit logs,
at least in distributed ChangeLog that we generate automatically
from those logs.  There were two parts:
  - recording which commits had problems and how to correct them
    (I'd been doing this for some time)
  - teaching the gitlog-to-changelog script to read and apply those
    transformations

I did #2 with this change in gnulib:
  http://git.sv.gnu.org/cgit/gnulib.git/commit/?id=57789615cb81dba607
#1 comes via the new file, build-aux/git-log-fix, below.


>From 2b5ef2dd9d01c4f0bacae443696b342bceee0263 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 31 Mar 2008 22:39:15 +0200
Subject: [PATCH] maint: fix git-log typos when generating ChangeLog

* gnulib: Update to latest, for new gitlog-to-changelog.
* Makefile.am (gen-ChangeLog): Use its new --amend=F option.
* build-aux/git-log-fix: New file, with ChangeLog fixes.
---
 Makefile.am           |    1 +
 build-aux/git-log-fix |   44 ++++++++++++++++++++++++++++++++++++++++++++
 gnulib                |    2 +-
 3 files changed, 46 insertions(+), 1 deletions(-)
 create mode 100644 build-aux/git-log-fix

diff --git a/Makefile.am b/Makefile.am
index 0359717..1ec2b36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,6 +99,7 @@ gen_start_date = 2008-02-08
 gen-ChangeLog:
        $(AM_V_GEN)if test -d .git; then                                \
          $(top_srcdir)/build-aux/gitlog-to-changelog                   \
+           --amend=$(srcdir)/build-aux/git-log-fix                     \
            --since=$(gen_start_date) > $(distdir)/cl-t;                \
          rm -f $(distdir)/ChangeLog;                                   \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
new file mode 100644
index 0000000..5a30b89
--- /dev/null
+++ b/build-aux/git-log-fix
@@ -0,0 +1,44 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.
+
+3a169f4c5d9159283548178668d2fae6fced3030
+# fix title:
+s/all tile types/all file types/
+
+e181802521d4e19e367dbe8cfa877296bb5dafb2
+# fix the title!
+s,seq:,factor:,
+
+3ece0355d52e41a1b079c0c46477a32250278c11
+# 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>
+
+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/
+# in this:
+# * tests/misc/uniq: New file.  Test for the above, but only
+# when isspace(0240).
+
+760bc6f7e73014e934a744a9d46ea8dbf5ba25c8
+s/Now, each/Now, the/;
+s!(elicits.*)\.!first $1, and the second works properly.!
+# change the log from this:
+#   Without this, `truncate -s '> -1' F` would truncate F to length 0,
+#   and `truncate -s " +1" F` would truncate F to 1 byte.  Now, each
+#   elicits a diagnostic.
+# to this:
+#   Without this, `truncate -s '> -1' F` would truncate F to length 0,
+#   and `truncate -s " +1" F` would truncate F to 1 byte.  Now, the
+#   first elicits a diagnostic, and the second works properly.
diff --git a/gnulib b/gnulib
index f2c5670..5778961 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f2c567087196c591677b4542e6f208f37892ec0f
+Subproject commit 57789615cb81dba6075ef76d3faddaa10dc61a07
--
1.7.8.rc0.32.g87bf9