diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-08-11 01:08:30 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-08-11 01:08:30 -0700 |
| commit | 55752d88321925da815823f968128832de6fdbbb (patch) | |
| tree | e627bc12812641c8f70419a10e17ba8b921188ee | |
| parent | 0f90d6055e5bea9ceb1d454db84f4aa1d59b284d (diff) | |
| download | spark-55752d88321925da815823f968128832de6fdbbb.tar.gz spark-55752d88321925da815823f968128832de6fdbbb.tar.bz2 spark-55752d88321925da815823f968128832de6fdbbb.zip | |
[SPARK-9810] [BUILD] Remove individual commit messages from the squash commit message
For more information, please see the JIRA ticket and the associated dev list discussion.
https://issues.apache.org/jira/browse/SPARK-9810
http://apache-spark-developers-list.1001551.n3.nabble.com/discuss-Removing-individual-commit-messages-from-the-squash-commit-message-td13295.html
Author: Reynold Xin <rxin@databricks.com>
Closes #8091 from rxin/SPARK-9810.
| -rwxr-xr-x | dev/merge_spark_pr.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index ad4b76695c..b9bdec3d70 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -159,11 +159,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc): merge_message_flags += ["-m", message] # The string "Closes #%s" string is required for GitHub to correctly close the PR - merge_message_flags += [ - "-m", - "Closes #%s from %s and squashes the following commits:" % (pr_num, pr_repo_desc)] - for c in commits: - merge_message_flags += ["-m", c] + merge_message_flags += ["-m", "Closes #%s from %s." % (pr_num, pr_repo_desc)] run_cmd(['git', 'commit', '--author="%s"' % primary_author] + merge_message_flags) |