From 3ace10dc91e72ebe5013d5106eb0968a77c99d8d Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Sat, 7 Jun 2014 16:16:37 -0700
Subject: [PATCH] HOTFIX: Support empty body in merge script
Discovered in #992
Author: Patrick Wendell <pwendell@gmail.com>
Closes #1007 from pwendell/hotfix and squashes the following commits:
af90aa0 [Patrick Wendell] HOTFIX: Support empty body in merge script
---
dev/merge_spark_pr.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index e3ac32ef1a..ffb70096d6 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])
--
GitLab