Skip to content

Commit

Permalink
[SPARK-9179] [BUILD] Use default primary author if unspecified
Browse files Browse the repository at this point in the history
Fixes feature introduced in apache#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 apache#7558 from shivaram/merge-script-fix and squashes the following commits:

7092141 [Shivaram Venkataraman] Use default primary author if unspecified
  • Loading branch information
shivaram committed Jul 21, 2015
1 parent 48f8fd4 commit 228ab65
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dev/merge_spark_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 228ab65

Please sign in to comment.