ARROW-5716: [Developer] Improve merge PR script to attribute multiple authors#4882
Closed
wesm wants to merge 5 commits intoapache:masterfrom
Closed
ARROW-5716: [Developer] Improve merge PR script to attribute multiple authors#4882wesm wants to merge 5 commits intoapache:masterfrom
wesm wants to merge 5 commits intoapache:masterfrom
Conversation
Member
Author
|
I tested this on a PR with a single author. I'll wait to merge something with multiple authors to see if it works correctly before merging this |
Member
Author
|
Still a little more work to do on this. The author bylines have to come at the very end of the commit message |
Member
Author
|
+1. I've used this to merge a multiple author commit (6109647) and single author commit now |
kszucs
pushed a commit
that referenced
this pull request
Jul 22, 2019
… authors See https://help.github.com/en/articles/creating-a-commit-with-multiple-authors. So when multiple people contribute to a PR it will show up in their contribution count. In the past we have only attributed the person with the most commits, or in the event of a tie, the most recent committer in a PR. We're having more PRs with multiple people involved so I think it's nice to acknowledge everyone. I also added the Signed-off-by: mark which includes the Apache committer information in the commit message This was implemented in Apache Spark in https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py so I've adopted the approach here. Closes #4882 from wesm/ARROW-5716 and squashes the following commits: 816a137 <Wes McKinney> Do not prompt for lead author if there is only one person involved 74fb732 <Wes McKinney> Put authors at end of commit message so GitHub understands them 6d65ceb <Wes McKinney> Fix DEBUG env variable flag logic 0ebc17e <Wes McKinney> Add debugging output 7924dab <Wes McKinney> Add support for lead/co-authors to merge script Authored-by: Wes McKinney <wesm+git@apache.org> Signed-off-by: Wes McKinney <wesm+git@apache.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See https://help.github.com/en/articles/creating-a-commit-with-multiple-authors. So when multiple people contribute to a PR it will show up in their contribution count. In the past we have only attributed the person with the most commits, or in the event of a tie, the most recent committer in a PR. We're having more PRs with multiple people involved so I think it's nice to acknowledge everyone.
I also added the Signed-off-by: mark which includes the Apache committer information in the commit message
This was implemented in Apache Spark in https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py so I've adopted the approach here.