-
Notifications
You must be signed in to change notification settings - Fork 235
Add mailmap to consolidate author identities and correctly count contributions #3905
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
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
seisman
commented
Apr 10, 2025
| exclude .gitignore | ||
| exclude .pre-commit-config.yaml | ||
| exclude .readthedocs.yaml | ||
| exclude .mailmap |
Member
Author
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems setuptools_scm automatically exclude the .mailmap file from distributions, but I guess it does no harm to explicitly exclude it here.
Co-authored-by: Yvonne Fröhlich <[email protected]>
michaelgrund
approved these changes
Apr 11, 2025
yvonnefroehlich
approved these changes
Apr 11, 2025
weiji14
reviewed
Apr 13, 2025
Co-authored-by: Wei Ji <[email protected]>
weiji14
approved these changes
Apr 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
maintenance
Boring but important stuff for the core devs
skip-changelog
Skip adding Pull Request to changelog
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.
With the new
git shortlogcommand introduced in PR #3904, the number of contributions per author still differs from the counts shown on the GitHub contributors page. This discrepancy is due to variations in the commit author names or email addresses used over time.This PR adds a
.mailmapfile (xref: https://git-scm.com/docs/gitmailmap) to resolve these inconsistencies automatically, avoiding the need to manually consolidate contributions from the same author.With this file in place, the contribution counts now match exactly with those shown at https://github.com/GenericMappingTools/pygmt/graphs/contributors (Max is an exception, likely due to a name change from Meghan to Max a few years ago.