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

; * ChangeLog.2: Related fixes.

diff --git a/ChangeLog.2 b/ChangeLog.2
index ff9cbdf7dc9e97d8ccdd7112c0496b0a2f8547bc..b3a5a85885e15d5a9d3e2385ce7e5acf4a3b59f3 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -726,8 +726,6 @@
        * doc/emacs/mule.texi (Modifying Fontsets): Document
        face-ignored-fonts.  (Bug#20628)
 
-       Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
-
        Add etags test for the new -Q option
        * test/etags/ETAGS.good_1, test/etags/ETAGS.good_2:
        * test/etags/ETAGS.good_3, test/etags/ETAGS.good_4:
@@ -1039,16 +1037,8 @@
 
 2015-05-27  Michael Albinus  <michael.albinus@gmx.de>
 
-       Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-       Conflicts:
-               lisp/net/tramp.el
-
        Fix typo in commit 3953c4be2816537be95520605d45b866dc731f4b
 
-2015-05-27  Eli Zaretskii  <eliz@gnu.org>
-
-       Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
-
 2015-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lisp/isearch.el (isearch--current-buffer): New var
@@ -2368,10 +2358,6 @@
        (vc-git-resolve-when-done): Update to honor the new variable.
        (Bug#20292)
 
-2015-05-16  Eli Zaretskii  <eliz@gnu.org>
-
-       Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
-
 2015-05-16  Artur Malabarba  <bruce.connor.am@gmail.com>
 
        * lisp/emacs-lisp/tabulated-list.el: Don't error on nil header-string
@@ -3484,8 +3470,6 @@
 
 2015-05-02  K. Handa  <handa@gnu.org>
 
-       Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-
        * cmds.c (internal_self_insert): When we insert spaces for
        padding, set point before the padding spaces, not after them.
 
@@ -3780,10 +3764,6 @@
        (rcirc-next-active-buffer): when there is no new activity, use
        `rcirc-bury-buffers' to hide all RCIRC buffers
 
-2015-04-29  Michael Albinus  <michael.albinus@gmx.de>
-
-       Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-
 2015-04-29  Krzysztof Jurewicz  <krzysztof.jurewicz@gmail.com>  (tiny change)
 
        Fix DBUS query result parsing for secrets-search-items
@@ -5405,10 +5385,6 @@
        `intangible' since that property is not used any more.
        (gnus-article-treat-body-boundary): Use gnus-hidden-properties.
 
-2015-04-09  Jay Belanger  <jay.p.belanger@gmail.com>
-
-       Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-
 2015-04-09  Dmitry Gutov  <dgutov@yandex.ru>
 
        Use the VC root in `log-edit-listfun'
@@ -5600,8 +5576,6 @@
 
 2015-04-08  Michael Albinus  <michael.albinus@gmx.de>
 
-       Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-
        Fix nasty scoping bug in tramp-cache.el
        * lisp/net/tramp-cache.el (tramp-flush-file-property): Fix nasty scoping bug.
 

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