-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
151 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,151 @@ | ||
# -*- coding: utf-8 -*- | ||
# See https://git-scm.com/docs/gitmailmap | ||
# Currently unused by GitHub; but useful to maintain a record | ||
|
||
# Aaron Carlisle (https://github.com/Blendify) | ||
Aaron Carlisle <[email protected]> <[email protected]> | ||
Aaron Carlisle <[email protected]> <[email protected]> | ||
|
||
# Adam Turner (https://github.com/AA-Turner) | ||
Adam Turner <[email protected]> <[email protected]> | ||
Adam Turner <[email protected]> <[email protected]> | ||
|
||
Akihiro Uchida <[email protected]> <[email protected]> | ||
|
||
Andrew M. Kuchling <[email protected]> <devnull@localhost> | ||
|
||
BΓ©nΓ©dikt Tran <[email protected]> | ||
|
||
# Chris (https://github.com/percious) | ||
Chris Perkins <[email protected]> | ||
|
||
Chris Lamb <[email protected]> <[email protected]> | ||
|
||
# Christian Clauss (https://github.com/cclauss) | ||
Christian Clauss <[email protected]> <[email protected]> | ||
|
||
# Daniel Eades (https://github.com/danieleades) | ||
Daniel Eades <[email protected]> | ||
Daniel Eades <[email protected]> <[email protected]> | ||
Daniel Eades <[email protected]> <[email protected]> | ||
|
||
# Daniel Hahler (https://github.com/blueyed) | ||
Daniel Hahler <[email protected]> <[email protected]> | ||
|
||
# Daniel NeuhΓ€user (https://github.com/DasIch) | ||
Daniel NeuhΓ€user <[email protected]> <[email protected]> | ||
|
||
David Ham <[email protected]> <David,[email protected]> | ||
|
||
# Dmitry Shachnev (https://github.com/mitya57) | ||
Dmitry Shachnev <[email protected]> <[email protected]> | ||
|
||
Erik M. Bray <[email protected]> | ||
Erik M. Bray <[email protected]> <[email protected]> | ||
|
||
Eric Holscher <[email protected]> <[email protected]> | ||
|
||
Eric Larson <[email protected]> | ||
|
||
# Eric Knibbe (https://github.com/EricFromCanada) | ||
Eric Knibbe <[email protected]> | ||
Eric Knibbe <[email protected]> <[email protected]> | ||
|
||
# Georg Brandl (https://github.com/birkenfeld) | ||
|
||
# Hugo van Kemenade (https://github.com/hugovk) | ||
Hugo van Kemenade <[email protected]> | ||
|
||
# Ignacio Fdez. GalvΓ‘n (https://github.com/Jellby) | ||
Ignacio Fdez. GalvΓ‘n <[email protected]> | ||
|
||
# Jakob Lykke Andersen (https://github.com/jakobandersen) | ||
Jakob Lykke Andersen <[email protected]> <[email protected]> | ||
Jakob Lykke Andersen <[email protected]> <[email protected]> | ||
|
||
Jakub Wilk <[email protected]> <[email protected]> | ||
|
||
James Hilton-Balfe <[email protected]> <[email protected]> | ||
|
||
# Jean-François B. (https://github.com/jfbu) | ||
Jean-François B. <[email protected]> | ||
Jean-François B. <[email protected]> <[email protected]> | ||
Jean-François B. <[email protected]> <[email protected]> | ||
|
||
Jean Abou-Samra <[email protected]> | ||
|
||
# Jeremy Maitin-Shepard (https://github.com/jbms) | ||
Jeremy Maitin-Shepard <[email protected]> <[email protected]> | ||
|
||
# Jon Dufresne (https://github.com/jdufresne) | ||
|
||
# Juan Luis Cano RodrΓguez (https://github.com/astrojuanlu) | ||
Juan Luis Cano RodrΓguez <[email protected]> <[email protected]> | ||
|
||
Justin Mathews <[email protected]> <[email protected]> | ||
|
||
# Justus Magin (https://github.com/keewis) | ||
Justus Magin <[email protected]> | ||
|
||
Latosha Maltba <[email protected]> | ||
|
||
# Louis Maddox (https://github.com/lmmx) | ||
Louis Maddox <[email protected]> <[email protected]> | ||
|
||
Mark Summerfield <mark.summerfield@localhost> | ||
|
||
# Martin LiΕ‘ka (https://github.com/marxin) | ||
Martin LiΕ‘ka <[email protected]> | ||
|
||
Matt Warrick <[email protected]> | ||
|
||
# Matthias Geier (https://github.com/mgeier) | ||
|
||
# Nils K (https://github.com/septatrix) | ||
Nils Kattenbeck <[email protected]> <[email protected]> | ||
|
||
Oleg Hoefling <[email protected]> | ||
|
||
# PaweΕ BudzyΕski (https://github.com/pbudzyns) | ||
PaweΕ BudzyΕski <[email protected]> | ||
PaweΕ BudzyΕski <[email protected]> | ||
|
||
Pradyun Gedam <[email protected]> | ||
Pradyun Gedam <[email protected]> <[email protected]> | ||
Pradyun Gedam <[email protected]> <[email protected]> | ||
|
||
# Robert Lehmann (https://github.com/lehmannro) | ||
Rob Ruana <[email protected]> <[email protected]> | ||
Rob Ruana <[email protected]> <[email protected]> | ||
|
||
Santos Gallegos <[email protected]> <[email protected]> | ||
|
||
Seth Girvin <[email protected]> | ||
|
||
# Shirou WAKAYAMA (https://github.com/shirou) | ||
Shirou WAKAYAMA <[email protected]> | ||
|
||
# Stephen Finucane (https://github.com/stephenfin) | ||
|
||
# Takayuki SHIMIZUKAWA (https://github.com/shimizukawa) | ||
Takayuki SHIMIZUKAWA <[email protected]> | ||
|
||
# Takeshi KOMIYA (https://github.com/tk0miya) | ||
Takeshi KOMIYA <[email protected]> | ||
Takeshi KOMIYA <[email protected]> <[email protected]> | ||
|
||
# Timotheus Kampik (https://github.com/TimKam) | ||
Timotheus Kampik <[email protected]> <[email protected]> | ||
|
||
# Tim Hoffmann (https://github.com/timhoffm) | ||
|
||
Thomas Kluyver <[email protected]> <[email protected]> | ||
|
||
# Wout de Nolf (https://github.com/woutdenolf) | ||
Wout de Nolf <[email protected]> | ||
|
||
# Yoshiki Shibukawa (https://github.com/shibukawa) | ||
Yoshiki Shibukawa <[email protected]> <[email protected]> | ||
Yoshiki Shibukawa <[email protected]> <yoshiki at shibu.jp> | ||
|
||
Zack Cerza <[email protected]> <[email protected]> |
ca0fc7a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AA-Turner I tried to contact you in a less public manner, perhaps via opening a Developers Team discussion but there does not seem to be a way to do that that I know of. I have a problem with this commit which I discover only now, after realizing a bit late (one year later!) to my amazement that git log showed my private email, whereas I have configured GitHub to keep it private and worse that this was reproducible from a friend checkout of sphinx. In the past I could have pushed directly a commit modifying this to remove my email, but I think I can't now. Making a PR would be very public which I try to avoid. Yes, I committed years ago with my private email, perhaps at that time GitHub did not yet have the possibility to use something such as
[email protected]
. But, one needs to look a bit in the commit history or t usegit shortlog
so indeed there is no way I can prevent harversters to get it, but here with this.mailmap
we have the situation that anyone doing agit clone
of Sphinx will have the data of a private email whereas my GitHub is configured to keep it private!ca0fc7a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @jfbu -- I can push a commit to remove your private email, but it will still be in the git log if anyone looks.
We could alternately force-push an update which entirely removes your email from the git log, but that might be quite disruptive.
What would you prefer?
A
ca0fc7a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello @AA-Turner thanks for your message. No force-pushing needed!
As you say it would be quite disruptive and the issue is not worth it.
There are 1212 commits (from
git log --format="%ae"
) which used my private email before I became aware of GitHub privacy setting (it may have no existed when I started contributing to Sphnx). It seems only 219 more recent commits are under[email protected]
or somejfbu@users
variant (fromgit log --oneline --author="jfbu@users" | wc -l
after moving away.mailmap
).I contribute less to Sphinx in recent years and did not at all pay attention to the commit of last August about
.mailmap
. Simply adjusting it to only refer to[email protected]
by some commit will fix the issue for me, although it will of course temporarily raise attention of passers-by, but this is better than having my private email in.mailmap
...Thanks for caring ;-)
JF
ca0fc7a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 26114fb!
A