You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/08/29 16:18:20 UTC
incubator-rocketmq git commit: Polish merge script,
use old title if input is null
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master 1b853e81a -> 4372eb919
Polish merge script, use old title if input is null
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/4372eb91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/4372eb91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/4372eb91
Branch: refs/heads/master
Commit: 4372eb919713edf7a7401a326dce9a3ffcba6687
Parents: 1b853e8
Author: yukon <yu...@apache.org>
Authored: Wed Aug 30 00:06:13 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Wed Aug 30 00:18:07 2017 +0800
----------------------------------------------------------------------
dev/merge_rocketmq_pr.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/4372eb91/dev/merge_rocketmq_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_rocketmq_pr.py b/dev/merge_rocketmq_pr.py
index 3a2388b..afc597a 100644
--- a/dev/merge_rocketmq_pr.py
+++ b/dev/merge_rocketmq_pr.py
@@ -146,8 +146,10 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
merge_message_flags = []
- title = raw_input("Modify commit log [%s]: " % title)
- merge_message_flags += ["-m", title]
+ modified_title = raw_input("Modify commit log [%s]: " % title)
+ if modified_title == "":
+ modified_title = title
+ merge_message_flags += ["-m", modified_title]
authors = "\n".join(["Author: %s" % a for a in distinct_authors])