From 45deb048ad6d6b93082515773df2ba21006c2f42 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 10 Jun 2015 21:37:06 -0400 Subject: [PATCH] * build-aux/gitlog-to-emacslog: Also ignore pointless merge commits. ; * ChangeLog.2: Related fixes. --- ChangeLog.2 | 26 -------------------------- build-aux/gitlog-to-emacslog | 5 ++++- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/ChangeLog.2 b/ChangeLog.2 index ff9cbdf7dc..b3a5a85885 100644 --- 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 - 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 - - Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs - 2015-05-27 Stefan Monnier * 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 - - Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs - 2015-05-16 Artur Malabarba * lisp/emacs-lisp/tabulated-list.el: Don't error on nil header-string @@ -3484,8 +3470,6 @@ 2015-05-02 K. Handa - 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 - - Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs - 2015-04-29 Krzysztof Jurewicz (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 - - Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs - 2015-04-09 Dmitry Gutov Use the VC root in `log-edit-listfun' @@ -5600,8 +5576,6 @@ 2015-04-08 Michael Albinus - 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 07b33e9aa4..4fec4de2d8 100755 --- 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 -- 2.39.2