From 16aa27d38b411286dc680fd7d14f4c74621da6cf Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Mon, 10 Aug 2015 18:58:23 -0700 Subject: [PATCH 1/2] [SPARK-9810][Build] Remove individual commit messages from the squash commit message. --- dev/merge_spark_pr.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index ad4b76695c9ff..4c7ef49a809d8 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -161,9 +161,8 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc): # 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] + "Closes #%s from %s and squashes %d commits." % ( + pr_num, pr_repo_desc, len(commits))] run_cmd(['git', 'commit', '--author="%s"' % primary_author] + merge_message_flags) From 41fbb7f1c375a70b5a1059191289e4472943931a Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Mon, 10 Aug 2015 22:06:16 -0700 Subject: [PATCH 2/2] Updated. --- dev/merge_spark_pr.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 4c7ef49a809d8..b9bdec3d70864 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -159,10 +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 %d commits." % ( - pr_num, pr_repo_desc, len(commits))] + merge_message_flags += ["-m", "Closes #%s from %s." % (pr_num, pr_repo_desc)] run_cmd(['git', 'commit', '--author="%s"' % primary_author] + merge_message_flags)