Repository: spark Updated Branches: refs/heads/master 62d4a0fa9 -> f1f7385a5
Strip '@' symbols when merging pull requests. Currently all of the commits with 'X' in them cause person X to receive e-mails every time someone makes a public fork of Spark. marmbrus who requested this. Author: Patrick Wendell <[email protected]> Closes #1239 from pwendell/strip and squashes the following commits: 22e5a97 [Patrick Wendell] Strip '@' symbols when merging pull requests. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f1f7385a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f1f7385a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f1f7385a Branch: refs/heads/master Commit: f1f7385a5087a80c936d419699e3f5232455f189 Parents: 62d4a0f Author: Patrick Wendell <[email protected]> Authored: Thu Jun 26 17:09:24 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu Jun 26 17:09:24 2014 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f1f7385a/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index ffb7009..c443202 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -130,7 +130,9 @@ def merge_pr(pr_num, target_ref): merge_message_flags += ["-m", title] if body != None: - merge_message_flags += ["-m", body] + # We remove @ symbols from the body to avoid triggering e-mails + # to people every time someone creates a public fork of Spark. + merge_message_flags += ["-m", body.replace("@", "")] authors = "\n".join(["Author: %s" % a for a in distinct_authors])
