Skip to content

Conversation

@seisman
Copy link
Member

@seisman seisman commented Apr 10, 2025

With the new git shortlog command 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 .mailmap file (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.

$ git shortlog -sne --group=author --group=trailer:co-authored-by | head -n 10
  1491	Dongdong Tian <[email protected]>
   626	Wei Ji Leong <[email protected]>
   427	Yvonne Fröhlich <[email protected]>
   293	Michael Grund <[email protected]>
   291	dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
   258	Leonardo Uieda <[email protected]>
   237	Will Schlitzer <[email protected]>
   203	Max Jones <[email protected]>
    55	Jiayuan Yao <[email protected]>
    17	actions-bot <[email protected]>

@seisman seisman added maintenance Boring but important stuff for the core devs skip-changelog Skip adding Pull Request to changelog needs review This PR has higher priority and needs review. labels Apr 10, 2025
@seisman seisman added this to the 0.16.0 milestone Apr 10, 2025
exclude .gitignore
exclude .pre-commit-config.yaml
exclude .readthedocs.yaml
exclude .mailmap
Copy link
Member Author

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]>
@seisman seisman added final review call This PR requires final review and approval from a second reviewer and removed needs review This PR has higher priority and needs review. labels Apr 12, 2025
Co-authored-by: Wei Ji <[email protected]>
@seisman seisman merged commit 1b71e0b into main Apr 14, 2025
7 checks passed
@seisman seisman deleted the mailmap branch April 14, 2025 01:29
@seisman seisman removed the final review call This PR requires final review and approval from a second reviewer label 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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants