From 228ab65a4eeef8a42eb4713edf72b50590f63176 Mon Sep 17 00:00:00 2001 From: Shivaram Venkataraman Date: Mon, 20 Jul 2015 23:31:08 -0700 Subject: [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 Closes #7558 from shivaram/merge-script-fix and squashes the following commits: 7092141 [Shivaram Venkataraman] Use default primary author if unspecified --- dev/merge_spark_pr.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dev/merge_spark_pr.py') 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 \" [%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") -- cgit v1.2.3