Skip to content

chore: add .mailmap to unify author identities - #1096

Draft
alaahong wants to merge 1 commit into
apache:mainfrom
alaahong:chore/mailmap-canonical-identity
Draft

chore: add .mailmap to unify author identities#1096
alaahong wants to merge 1 commit into
apache:mainfrom
alaahong:chore/mailmap-canonical-identity

Conversation

@alaahong

Copy link
Copy Markdown
Member

What

Adds a repository-root .mailmap that maps a personal address used in some earlier commits onto the corresponding ASF identity:

Zhang Zhe <zhangzhe@apache.org> ian zhang <ian.zhangzhe@gmail.com>

Why

A few commits (for example the RC6 release commit 8f1e1e1) were authored under a personal address, while the release itself is signed and published under the ASF identity zhangzhe@apache.org. .mailmap canonicalizes the author identity for git log / git shortlog / git blame and for the GitHub contributors view, so the public history is attributed consistently.

Scope and safety

  • Display-level only: no history rewrite, no force-push. All existing SHAs, PR links and signed tags stay valid.
  • Does not touch any already-staged release artifact, the 2.1.0-incubating-rc6 tag, or dist/dev.
  • Single added file; no build or runtime impact.

Verification

$ git shortlog -sne HEAD | grep 'Zhang Zhe'
    56  Zhang Zhe <zhangzhe@apache.org>

$ git log --use-mailmap --author='ian.zhangzhe'
(no output - all such commits are folded onto the ASF identity)

Earlier commits were authored with a personal address. Map it onto the canonical ASF identity so git log/shortlog/blame and the GitHub contributors view show a single author. No history is rewritten.
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.

1 participant