llvm dev - May 2021 - Proposal: Adding a toplevel .mailmap file

Hi,

I commit LLVM patches using two different email addresses. This means my
changes show up as two lines in `git shortlog -nes <path>`, and `git log
--author=thakis` only finds some of my changes. I know several others also
use commit using different email addresses.

It's possible to add a file `.mailmap` to the root of the repo that tells
git to merge different email addresses to the same person for display
purposes (https://git-scm.com/docs/gitmailmap). For example, if that file
exists and contains

    Nico Weber <thakis at chromium.org> <nicolasweber at gmx.de>

then `git log --author=thakis` will show all my commits.

I currently have that locally. Should we have this file checked in?
Everybody who wanted could add their different aliases, and it gives people
control over what they want to show as their primary email address. Linux
for example has it checked in:
https://github.com/torvalds/linux/blob/master/.mailmap

Nico
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20210525/0bbd1bb9/attachment.html>

Offhand this seems like a good idea to me—as another example, someone might
change companies and therefore email addresses, but it would be good to have a
way to identify all contributions from the same person.

On the other hand… github IDs can have multiple addresses, is there a way to
leverage that?  But maybe github IDs are a github thing rather than a git thing,
which makes that difficult?
--paulr

From: cfe-dev <cfe-dev-bounces at lists.llvm.org> On Behalf Of Nico Weber
via cfe-dev
Sent: Tuesday, May 25, 2021 9:31 AM
To: llvm-dev <llvm-dev at lists.llvm.org>; cfe-dev <cfe-dev at
lists.llvm.org>
Subject: [cfe-dev] Proposal: Adding a toplevel .mailmap file

Hi,

I commit LLVM patches using two different email addresses. This means my changes
show up as two lines in `git shortlog -nes <path>`, and `git log
--author=thakis` only finds some of my changes. I know several others also use
commit using different email addresses.

It's possible to add a file `.mailmap` to the root of the repo that tells
git to merge different email addresses to the same person for display purposes
(https://git-scm.com/docs/gitmailmap<https://urldefense.com/v3/__https:/git-scm.com/docs/gitmailmap__;!!JmoZiZGBv3RvKRSx!tP5GjShGmoDCp9BanQE-t9ziaOL_xFjKcougap5sqbszoaFmjb_DUgTf5fjSgf-Vgw$>).
For example, if that file exists and contains

    Nico Weber <thakis at chromium.org<mailto:thakis at
chromium.org>> <nicolasweber at gmx.de<mailto:nicolasweber at
gmx.de>>

then `git log --author=thakis` will show all my commits.

I currently have that locally. Should we have this file checked in? Everybody
who wanted could add their different aliases, and it gives people control over
what they want to show as their primary email address. Linux for example has it
checked in:
https://github.com/torvalds/linux/blob/master/.mailmap<https://urldefense.com/v3/__https:/github.com/torvalds/linux/blob/master/.mailmap__;!!JmoZiZGBv3RvKRSx!tP5GjShGmoDCp9BanQE-t9ziaOL_xFjKcougap5sqbszoaFmjb_DUgTf5fipW-yJZw$>

Nico
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20210525/ffb468de/attachment-0001.html>