Skip to content

chore: add .mailmap to unify author identity#11

Merged
brittanyreese merged 1 commit into
mainfrom
chore/mailmap-unify-author
Jul 3, 2026
Merged

chore: add .mailmap to unify author identity#11
brittanyreese merged 1 commit into
mainfrom
chore/mailmap-unify-author

Conversation

@brittanyreese

Copy link
Copy Markdown
Owner

Same person committed under two identities: PR squash-merges as Brittany Reese <recuriax@pm.me> (the GitHub account email), direct commits as the GitHub noreply address. So git shortlog -sne and the GitHub contributor graph showed two authors for one person.

Adds a .mailmap mapping both to the canonical Brittany Reese Markides <…noreply…> (matches CITATION.cff; keeps the personal email out of public history). Non-destructive: no history rewrite, applied at display time. Verified: git shortlog -sne main collapses from 2 authors to 1 (76 commits).

Also allowlists .mailmap in scripts/check_no_scaffolding.sh (the scaffolding guard requires new top-level paths be added in the same commit).

The PR squash-merges landed under Brittany Reese <recuriax@pm.me> (the GitHub
account email) while direct commits used the GitHub noreply address, so the same
author showed up as two contributors in git shortlog and the GitHub graph. Map
both to the canonical Brittany Reese Markides <...noreply...> identity (matches
CITATION.cff and keeps the personal email out of the public history). No history
rewrite; shortlog and GitHub apply .mailmap at display time.

Allowlist .mailmap in the scaffolding guard in the same commit, per its rule.
Copilot AI review requested due to automatic review settings July 3, 2026 10:13

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a Git .mailmap to consolidate a single contributor’s commits that currently appear under multiple author identities, improving attribution consistency in git shortlog and GitHub’s contributor display without rewriting history.

Changes:

  • Add a repository .mailmap entry mapping the alternate email identity to the canonical author name/email.
  • Allowlist .mailmap as an approved top-level path in the scaffolding guard script.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
scripts/check_no_scaffolding.sh Adds .mailmap to the top-level allowlist so the pre-commit scaffolding guard permits it.
.mailmap Introduces a mailmap mapping to unify contributor identity in Git tooling output.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@brittanyreese brittanyreese merged commit 30fdbde into main Jul 3, 2026
5 checks passed
brittanyreese added a commit that referenced this pull request Jul 3, 2026
The PR squash-merges landed under Brittany Reese <recuriax@pm.me> (the GitHub
account email) while direct commits used the GitHub noreply address, so the same
author showed up as two contributors in git shortlog and the GitHub graph. Map
both to the canonical Brittany Reese Markides <...noreply...> identity (matches
CITATION.cff and keeps the personal email out of the public history). No history
rewrite; shortlog and GitHub apply .mailmap at display time.

Allowlist .mailmap in the scaffolding guard in the same commit, per its rule.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants