[GitHub] spark pull request #21991: [SPARK-25018] [Infra] Use `Co-authored-by` and `S...

[dbtsai <gi...@git.apache.org>]

Github user dbtsai commented on a diff in the pull request:

    https://github.com/apache/spark/pull/21991#discussion_r207680824
  
    --- Diff: dev/merge_spark_pr.py ---
    @@ -154,20 +154,22 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
             # 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])
    -
    -    merge_message_flags += ["-m", authors]
    +    committer_name = run_cmd("git config --get user.name").strip()
    +    committer_email = run_cmd("git config --get user.email").strip()
     
         if had_conflicts:
    -        committer_name = run_cmd("git config --get user.name").strip()
    -        committer_email = run_cmd("git config --get user.email").strip()
             message = "This patch had conflicts when merged, resolved by\nCommitter: %s <%s>" % (
                 committer_name, committer_email)
             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." % (pr_num, pr_repo_desc)]
     
    +    authors = "\n".join(["Co-authored-by: %s" % a for a in distinct_authors])
    --- End diff --
    
    For single author commit, should we do `Authored-by` instead of `Co-authored-by`? 


---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org