Support .mailmap for author identity resolution#79
Merged
andrew merged 2 commits intogit-pkgs:mainfrom Feb 5, 2026
Merged
Conversation
Add mailmap parsing and resolution to correctly attribute contributors when a .mailmap file exists in the repository root. This helps deduplicate author entries in blame, history, and stats output. Supports all four mailmap formats: - Proper Name <email> (canonical name for email) - <proper@email> <commit@email> (email replacement) - Proper Name <proper@email> <commit@email> (full replacement by email) - Proper Name <proper@email> Commit Name <commit@email> (full match) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Contributor
Author
|
@andrew I don't write much go, so I had a bot help me here. It seems reasonably isolated to me, and I built and ran it on my example repo and it produced the expected results after a |
The bisect command now resolves author names and emails through .mailmap when displaying the culprit commit. This ensures consistent author attribution across all commands (blame, stats, history, and bisect). Adds test coverage to verify mailmap resolution works correctly when bisect identifies the first bad commit.
Contributor
|
LGTM, thanks @miketheman, I've added the same approach to the bisect command as well. |
andrew
approved these changes
Feb 5, 2026
Contributor
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
2 participants
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.
Add mailmap parsing and resolution to correctly attribute contributors when a .mailmap file exists in the repository root. This helps deduplicate author entries in blame, history, and stats output.
Supports all four mailmap formats:
Resolves #78