>From da0c991fc210197c73a149a1dbea0cc536ceb1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= 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 + + 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 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