Repository: spark Updated Branches: refs/heads/master a6c72ab16 -> 3ace10dc9
HOTFIX: Support empty body in merge script Discovered in #992 Author: Patrick Wendell <pwend...@gmail.com> Closes #1007 from pwendell/hotfix and squashes the following commits: af90aa0 [Patrick Wendell] HOTFIX: Support empty body in merge script Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3ace10dc Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3ace10dc Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3ace10dc Branch: refs/heads/master Commit: 3ace10dc91e72ebe5013d5106eb0968a77c99d8d Parents: a6c72ab Author: Patrick Wendell <pwend...@gmail.com> Authored: Sat Jun 7 16:16:37 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Sat Jun 7 16:16:37 2014 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3ace10dc/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index e3ac32e..ffb7009 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -128,8 +128,9 @@ def merge_pr(pr_num, target_ref): merge_message_flags = [] - for p in [title, body]: - merge_message_flags += ["-m", p] + merge_message_flags += ["-m", title] + if body != None: + merge_message_flags += ["-m", body] authors = "\n".join(["Author: %s" % a for a in distinct_authors])
