diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-06-07 16:16:37 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-07 16:16:37 -0700 |
| commit | 3ace10dc91e72ebe5013d5106eb0968a77c99d8d (patch) | |
| tree | 07dc2ad3e970dfae5178bbcd601e70d94c4c4083 /dev/merge_spark_pr.py | |
| parent | a6c72ab16e7a3027739ab419819f5222e270838e (diff) | |
| download | spark-3ace10dc91e72ebe5013d5106eb0968a77c99d8d.tar.gz spark-3ace10dc91e72ebe5013d5106eb0968a77c99d8d.tar.bz2 spark-3ace10dc91e72ebe5013d5106eb0968a77c99d8d.zip | |
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
Diffstat (limited to 'dev/merge_spark_pr.py')
| -rwxr-xr-x | dev/merge_spark_pr.py | 5 |
1 files 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]) |