Repository: spark
Updated Branches:
  refs/heads/master 0f90d6055 -> 55752d883


[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 <r...@databricks.com>

Closes #8091 from rxin/SPARK-9810.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/55752d88
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/55752d88
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/55752d88

Branch: refs/heads/master
Commit: 55752d88321925da815823f968128832de6fdbbb
Parents: 0f90d60
Author: Reynold Xin <r...@databricks.com>
Authored: Tue Aug 11 01:08:30 2015 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Tue Aug 11 01:08:30 2015 -0700

----------------------------------------------------------------------
 dev/merge_spark_pr.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/55752d88/dev/merge_spark_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index ad4b766..b9bdec3 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)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to