On 04/18/2014 11:06 PM, Assaf Gordon wrote:
> Hello,
>
> A recent change added a stub "git-log-fix" file to gnulib:
> http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=ce457d622d947d8aa3e325d98a2818d097e7fec9
>
> But, it might have an unintended consequences:
> When updating "gnulib" submodule in a project, it overrides the project's
> "git-log-fix".
>
> It can be demonstrated with GNU Hello, but probably represents a bigger issue
> with coreutils.
Good point!
Attached is a gnulib patch to revert the recent changes,
and a GNU hello patch to improve the gen_Changelog target
to make git-log-fix optional.
thanks,
Pádraig.
>From da0c991fc210197c73a149a1dbea0cc536ceb1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com>
Date: Sat, 19 Apr 2014 00:50:11 +0100
Subject: [PATCH] gitlog-to-changelog: revert inclusion of git-log-fix file
Assaf Gordon reported that this would replace a project's
existing git-log-fix. This file is always going to be project
specific if it exists at all, so it's better to make it optional.
A corresponding change will be made to GNU hello to improve that.
* build-aux/git-log-fix: Delete dummy file.
* modules/gitlog-to-changelog: Don't reference the project
specific git-log-fix file.
---
ChangeLog | 7 +++++++
build-aux/git-log-fix | 9 ---------
modules/gitlog-to-changelog | 1 -
3 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 build-aux/git-log-fix
diff --git a/ChangeLog b/ChangeLog
index fb25112..901cdab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-18 Pádraig Brady <p...@draigbrady.com>
+
+ gitlog-to-changelog: revert inclusion of git-log-fix file
+ * build-aux/git-log-fix: Delete dummy file.
+ * modules/gitlog-to-changelog: Don't reference (overwrite)
+ the project specific git-log-fix file.
+
2014-04-17 Paul Eggert <egg...@cs.ucla.edu>
regex: do not depend on malloc-gnu
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
deleted file mode 100644
index 1049375..0000000
--- a/build-aux/git-log-fix
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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.
-
-# Here is an example, with leading "#" to comment it out:
-#
-#3a169f4c5d9159283548178668d2fae6fced3030
-## fix title:
-#s/all tile types/all file types/
diff --git a/modules/gitlog-to-changelog b/modules/gitlog-to-changelog
index 3897c32..4b40334 100644
--- a/modules/gitlog-to-changelog
+++ b/modules/gitlog-to-changelog
@@ -3,7 +3,6 @@ Convert git log to ChangeLog
Files:
build-aux/gitlog-to-changelog
-build-aux/git-log-fix
Depends-on:
--
1.7.7.6
>From 5e8f444a859f1f8afb481afcbaff19c7256de4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com>
Date: Sat, 19 Apr 2014 00:08:57 +0100
Subject: [PATCH] build: make git-log-fix optional in make dist
* Makefile.am (gen_changelog): Make git-log-fix optional.
Also only remove existing Changelog on successful completion
of gitlog-to-changelog and propogate exit status appropriately.
---
Makefile.am | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5187ebd..5fc61c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,9 +134,10 @@ gen_start_date = 2011-12-17
.PHONY: gen-ChangeLog
gen-ChangeLog:
$(AM_V_GEN)if test -d .git; then \
+ log_fix="$(srcdir)/build-aux/git-log-fix"; \
+ test -e "$$log_fix" && amend_git_log="--amend=$$log_fix"; \
$(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; \
+ $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+ { rm -f $(distdir)/ChangeLog && \
+ mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
fi
--
1.7.7.6
