Repository: incubator-rocketmq
Updated Branches:
  refs/heads/develop ed4821ae0 -> 845830865 (forced update)


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/84583086
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/84583086
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/84583086

Branch: refs/heads/develop
Commit: 845830865fc37d0364a19cbd89ceaf8a30b37e1c
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:06:13 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/84583086/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])
 

Reply via email to