60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 718ac7342412aa7f32aaf3e9f379beb84883406e Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@redhat.com>
|
|
Date: Sat, 6 Oct 2012 15:09:56 +0200
|
|
Subject: [PATCH 33/89] maint: fix an error in the preceding commit log
|
|
|
|
Stefano Lattarini noticed an error in the log for
|
|
commit v3.1-32-g478e472. Arrange for that error
|
|
to be fixed in the generated ChangeLog file.
|
|
* build-aux/git-log-fix: New file.
|
|
* Makefile.am (gen-ChangeLog): Adjust rule to use it.
|
|
---
|
|
.gitignore | 3 ++-
|
|
Makefile.am | 1 +
|
|
build-aux/git-log-fix | 7 +++++++
|
|
3 files changed, 10 insertions(+), 1 deletion(-)
|
|
create mode 100644 build-aux/git-log-fix
|
|
|
|
diff --git a/.gitignore b/.gitignore
|
|
index 054d9ea..5bb95d4 100644
|
|
--- a/.gitignore
|
|
+++ b/.gitignore
|
|
@@ -32,7 +32,8 @@ Makefile.in
|
|
TAGS
|
|
aclocal.m4
|
|
autom4te.cache
|
|
-build-aux
|
|
+/build-aux/*
|
|
+!/build-aux/git-log-fix
|
|
config.cache
|
|
config.h
|
|
config.hin
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 5e52a42..686b61c 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -107,6 +107,7 @@ gen_start_date = 2000-01-01
|
|
gen-ChangeLog:
|
|
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..e2a68ee
|
|
--- /dev/null
|
|
+++ b/build-aux/git-log-fix
|
|
@@ -0,0 +1,7 @@
|
|
+# 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.
|
|
+
|
|
+478e472bf9f1c76b66a35ea75b45110152e5207d
|
|
+# Fix the log message:
|
|
+s,stderr,/dev/null,
|
|
--
|
|
1.8.5.3
|
|
|