summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2015-12-18 22:51:23 +0000
committerJames Youngman <jay@gnu.org>2015-12-18 22:51:48 +0000
commit47a2bb7d8e889d4ca84d5d48f9b679242825b3a5 (patch)
tree1a26462eb24bebc475b87df2a1dc5ccfea206881
parent4bce720c01367736e101f484b0939f5e0e56debb (diff)
downloadfindutils-47a2bb7d8e889d4ca84d5d48f9b679242825b3a5.tar.gz
Re-format some ChangeLog messages and remove revent boring ones.
* build-aux/git-log-fix: Re-format the log messages from the last few commits in order to end up with nicely-formatted ChangeLog entries, and remove the ChangeLog entries which would otherwise have reflected the git changes needed to make the corrections.
-rw-r--r--build-aux/git-log-fix17
1 files changed, 17 insertions, 0 deletions
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index e66c947a..6af85101 100644
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -2,6 +2,23 @@
# option. It specifies what changes to make to each given SHA1's commit
# log and metadata, using Perl-eval'able expressions.
+# Ignore the revert message (since it reverts a commit which just had an incorrect
+# log message)
+4bce720c01367736e101f484b0939f5e0e56debb
+s,Revert change.*,,m;
+s,This reverts.*,,m
+
+# Ignore the log message resulting from a spurious merge.
+f05ecf7731f6107f68979876643f5d7adc20227d
+s,Merge branch.*,,m
+
+# This is a commit with a badly-formatted commit log message. Change
+# e7a2c8f67b9af8a32f035bc41c074a547ec44fae has a correctly formatted
+# version of the message, which is why this change was reverted.
+db79379e3bae8d3dbdad1400c34a65820bac8cb7
+s,\t.*,,mg;
+s,2015-12-18.*,,mg;
+
# Remove a spurious date header and leading tabs (i.e. fix up following
# the use of ChangeLog-formatted string as a git log message).
0734748302f5a09e225784e953c469217dfa2d85