[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 9524ec5 1/2: Ignore more merges when generating C
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 9524ec5 1/2: Ignore more merges when generating ChangeLog |
Date: |
Wed, 23 Mar 2016 22:08:22 +0000 |
branch: emacs-25
commit 9524ec5e4e3c7c3036f2640b2595d3755894c1b3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Ignore more merges when generating ChangeLog
* build-aux/gitlog-to-emacslog: Ignore all merges from gnu.org,
not merely those from master and emacs-NN. The ChangeLog entries
they generate are not that useful.
---
build-aux/gitlog-to-emacslog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index bcc47b1..5c187f5 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -77,7 +77,7 @@ test -d .git || {
# 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|emacs-[0-9][0-9])' of
git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch
'.*'$" \
+ --ignore-matching="^; |^Merge branch '[^']*' of
git\.(savannah|sv)\.gnu\.org:/srv/git/emacs|^Merge remote-tracking branch
'.*'$" \
--ignore-line='^; ' --format='%B' \
"$gen_origin..$new_origin" >"ChangeLog.tmp" || exit