[Asterisk-code-review] mkrelease: Ignore merge commits for the ChangeLog (repotools[master])

[Matt Jordan]

Matt Jordan has submitted this change and it was merged.

Change subject: mkrelease: Ignore merge commits for the ChangeLog
......................................................................


mkrelease: Ignore merge commits for the ChangeLog

When the release summary processes the log messages between two tags, by
default, it will also include all merge commits, that is, a commit with
more than one parent. For the purposes of the ChangeLog, however, we
don't really need those commits.

This patch updates the mkrelease script to pass over the merge commits
when generating new entries for the ChangeLog.

Change-Id: I270cd1e26ad7d0ea69a104283aff2b1c4078b65d
---
M mkrelease.py
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/mkrelease.py b/mkrelease.py
index 4a2a9fa..ab1706c 100755
--- a/mkrelease.py
+++ b/mkrelease.py
@@ -255,6 +255,8 @@
             c_file.write("\t* {0} {1} Released.\n\n".format(options.project,
                                                             version))
             for log_message in summary.raw_log_messages:
+                if log_message.raw and len(log_message.raw.parents) > 1:
+                    continue
                 c_file.write(log_message.get_change_log())
 
             with open(old_log_path, 'r') as old_file:

-- 
To view, visit https://gerrit.asterisk.org/509
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I270cd1e26ad7d0ea69a104283aff2b1c4078b65d
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>