Repository: spark Updated Branches: refs/heads/master 48f8fd46b -> 228ab65a4
[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 <shiva...@cs.berkeley.edu> Closes #7558 from shivaram/merge-script-fix and squashes the following commits: 7092141 [Shivaram Venkataraman] Use default primary author if unspecified Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/228ab65a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/228ab65a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/228ab65a Branch: refs/heads/master Commit: 228ab65a4eeef8a42eb4713edf72b50590f63176 Parents: 48f8fd4 Author: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Authored: Mon Jul 20 23:31:08 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Mon Jul 20 23:31:08 2015 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/228ab65a/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index d586a57..ad4b766 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") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org