diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-07-20 23:31:08 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-07-20 23:31:08 -0700 |
| commit | 228ab65a4eeef8a42eb4713edf72b50590f63176 (patch) | |
| tree | eb3270a14658f2ef8e3a1aa31cef8138dcca55d2 /dev/merge_spark_pr.py | |
| parent | 48f8fd46b32973f1f3b865da80345698cb1a71c7 (diff) | |
| download | spark-228ab65a4eeef8a42eb4713edf72b50590f63176.tar.gz spark-228ab65a4eeef8a42eb4713edf72b50590f63176.tar.bz2 spark-228ab65a4eeef8a42eb4713edf72b50590f63176.zip | |
[SPARK-9179] [BUILD] Use default primary author if unspecified
Fixes feature introduced in #7508 to use the default value if nothing is specified in command line
cc liancheng rxin pwendell
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #7558 from shivaram/merge-script-fix and squashes the following commits:
7092141 [Shivaram Venkataraman] Use default primary author if unspecified
Diffstat (limited to 'dev/merge_spark_pr.py')
| -rwxr-xr-x | dev/merge_spark_pr.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index d586a57481..ad4b76695c 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -133,6 +133,8 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc): primary_author = raw_input( "Enter primary author in the format of \"name <email>\" [%s]: " % distinct_authors[0]) + if primary_author == "": + primary_author = distinct_authors[0] commits = run_cmd(['git', 'log', 'HEAD..%s' % pr_branch_name, '--pretty=format:%h [%an] %s']).split("\n\n") |