Add .mailmap to consolidate contributor identities - #183
francisco-dlp wants to merge 2 commits into
Conversation
Several contributors committed under multiple email addresses or display names (university-era addresses, login-as-name, bot-mangled identities), which fragments git shortlog/blame output and, where the address is not linked to a GitHub account, hides commits from the GitHub contributors view. This mailmap consolidates every duplicate or broken identity found in the git history to a canonical name and email - the same consolidation already proposed for hyperspy/hyperspy in gh-3685. Assisted-by: OmO:Kimi-K3
Assisted-by: OmO:Kimi-K3
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #183 +/- ##
=======================================
Coverage 88.33% 88.33%
=======================================
Files 100 100
Lines 7764 7764
Branches 932 932
=======================================
Hits 6858 6858
Misses 632 632
Partials 274 274 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
CI note for reviewers: the diff is |
The problem
GitHub attributes commits to accounts via registered email addresses. Several contributors committed under multiple addresses or display names (university-era addresses, login-as-name), which fragments
git shortlog/git blameand, where the address is not linked to a GitHub account, hides commits from the contributors view. For example Tomas Ostasevicius's Cambridge-era address (to266@cam.ac.uk) carries 155 exspy commits that GitHub attributes to nobody.The fix
A
.mailmapconsolidating every duplicate or broken identity found in the git history (verified againstgit logand checked withgit check-mailmap). The same consolidation was proposed for hyperspy/hyperspy in gh-3685; the canonical name and email per person match that mailmap for cross-repo consistency.Verification
git shortlog -sneafter the mailmap (selection): Francisco de la Peña 1496 (was split across 4 identities), Eric Prestat 1103, Jonas Lähnemann 326 (was 2), Tomas Ostasevicius 254 (was 2: 99 + 155), Michael Sarahan 148 (was 4, incl. a brokenunknown <Mike@.(none)>and@superstem.org), Magnus Nord (was 6 identities incl. ntnu/glasgow/jobbPC), Vidar Tonaas Fauske 137 (was 2), Alberto Eljarrat (was 2), Carter Francis (was 4, incl. commits asshaw), Petras Jokubauskas (was 3), Tom Furnival (was 3), Tom Slater (was 2), Timothy Poon (was 4), Thomas Aarholt (was 2), Zezhong Zhang (was 2), Giulio Guzzinati (was 2), Francisco de la Peña (was 5 incl.Francisco@ogre.msm.cam.ac.uk... the Cambridge ogre machine). Unique author identities: 91 -> 62.Notes
Assisted-by: OmO:Kimi-K3in the commit trailer).