* build-aux/gitlog-to-emacslog: Also ignore pointless merge commits.

[gnu-emacs] / build-aux / gitlog-to-emacslog

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 07b33e9aa4d460e7457634a6f4abb691633aa7e2..4fec4de2d8b2702a9d2b7088c706688c78531c21 100755 (executable)
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -74,7 +74,10 @@ test -d .git || {
 }
 
 # Use Gnulib's packaged ChangeLog generator.
-./build-aux/gitlog-to-changelog --ignore-matching='^; ' \
+# Maybe we should skip all "Merge branch 'master'" messages.
+# See eg the cairo-related ones.
+./build-aux/gitlog-to-changelog \
+    --ignore-matching="^; |^Merge branch 'master' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$" \
   --ignore-line='^; ' --format='%B' \
   "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit