-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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 <carlisle.aaron00@gmail.com> <carlisle.b3d@gmail.com> | ||
| Aaron Carlisle <carlisle.aaron00@gmail.com> <Blendify@users.noreply.github.com> | ||
|
|
||
| # Adam Turner (https://github.com/AA-Turner) | ||
| Adam Turner <9087854+AA-Turner@users.noreply.github.com> <9087854+aa-turner@users.noreply.github.com> | ||
| Adam Turner <9087854+AA-Turner@users.noreply.github.com> <AA-Turner@users.noreply.github.com> | ||
|
|
||
| Akihiro Uchida <uchida@ike-dyn.ritsumei.ac.jp> <uchida@turbare.net> | ||
|
|
||
| Andrew M. Kuchling <amk@amk.ca> <devnull@localhost> | ||
|
|
||
| BΓ©nΓ©dikt Tran <10796600+picnixz@users.noreply.github.com> | ||
|
|
||
| # Chris (https://github.com/percious) | ||
| Chris Perkins <chris@percious.com> | ||
|
|
||
| Chris Lamb <lamby@debian.org> <chris@chris-lamb.co.uk> | ||
|
|
||
| # Christian Clauss (https://github.com/cclauss) | ||
| Christian Clauss <cclauss@me.com> <cclauss@bluewin.ch> | ||
|
|
||
| # Daniel Eades (https://github.com/danieleades) | ||
| Daniel Eades <danieleades@hotmail.com> | ||
| Daniel Eades <danieleades@hotmail.com> <daniel.eades@hotmail.com> | ||
| Daniel Eades <danieleades@hotmail.com> <33452915+danieleades@users.noreply.github.com> | ||
|
|
||
| # Daniel Hahler (https://github.com/blueyed) | ||
| Daniel Hahler <git@thequod.de> <github@thequod.de> | ||
|
|
||
| # Daniel NeuhΓ€user (https://github.com/DasIch) | ||
| Daniel NeuhΓ€user <dasdasich@gmail.com> <ich@danielneuhaeuser.de> | ||
|
|
||
| David Ham <David.Ham@imperial.ac.uk> <David,Ham@imperial.ac.uk> | ||
|
|
||
| # Dmitry Shachnev (https://github.com/mitya57) | ||
| Dmitry Shachnev <mitya57@users.noreply.github.com> <mitya57@gmail.com> | ||
|
|
||
| Erik M. Bray <erik.bray@lri.fr> | ||
| Erik M. Bray <erik.bray@lri.fr> <embray@stsci.edu> | ||
|
|
||
| Eric Holscher <eric@ericholscher.com> <25510+ericholscher@users.noreply.github.com> | ||
|
|
||
| Eric Larson <larson.eric.d@gmail.com> | ||
|
|
||
| # Eric Knibbe (https://github.com/EricFromCanada) | ||
| Eric Knibbe <eric3knibbe@gmail.com> | ||
| Eric Knibbe <eric3knibbe@gmail.com> <eric@lassosoft.com> | ||
|
|
||
| # Georg Brandl (https://github.com/birkenfeld) | ||
|
|
||
| # Hugo van Kemenade (https://github.com/hugovk) | ||
| Hugo van Kemenade <hugovk@users.noreply.github.com> | ||
|
|
||
| # Ignacio Fdez. GalvΓ‘n (https://github.com/Jellby) | ||
| Ignacio Fdez. GalvΓ‘n <jellby@yahoo.com> | ||
|
|
||
| # Jakob Lykke Andersen (https://github.com/jakobandersen) | ||
| Jakob Lykke Andersen <Jakob@caput.dk> <jakobandersen@users.noreply.github.com> | ||
| Jakob Lykke Andersen <Jakob@caput.dk> <jakob@caput.dk> | ||
|
|
||
| Jakub Wilk <jwilk@jwilk.net> <jwilk@debian.org> | ||
|
|
||
| James Hilton-Balfe <gobot1234yt@gmail.com> <50501825+Gobot1234@users.noreply.github.com> | ||
|
|
||
| # Jean-François B. (https://github.com/jfbu) | ||
| Jean-François B. <jfbu@free.fr> | ||
| Jean-François B. <jfbu@free.fr> <jfbu@users.noreply.github.com> | ||
| Jean-François B. <jfbu@free.fr> <2589111+jfbu@users.noreply.github.com> | ||
|
|
||
| Jean Abou-Samra <jean@abou-samra.fr> | ||
|
|
||
| # Jeremy Maitin-Shepard (https://github.com/jbms) | ||
| Jeremy Maitin-Shepard <jbms@google.com> <jeremy@jeremyms.com> | ||
|
|
||
| # Jon Dufresne (https://github.com/jdufresne) | ||
|
|
||
| # Juan Luis Cano RodrΓguez (https://github.com/astrojuanlu) | ||
| Juan Luis Cano RodrΓguez <juanlu@readthedocs.org> <hello@juanlu.space> | ||
|
|
||
| Justin Mathews <justin.mathews@isara.com> <jamathews@users.noreply.github.com> | ||
|
|
||
| # Justus Magin (https://github.com/keewis) | ||
| Justus Magin <keewis@posteo.de> | ||
|
|
||
| Latosha Maltba <79100569+latosha-maltba@users.noreply.github.com> | ||
|
|
||
| # Louis Maddox (https://github.com/lmmx) | ||
| Louis Maddox <louismmx@gmail.com> <lmmx@users.noreply.github.com> | ||
|
|
||
| Mark Summerfield <mark.summerfield@localhost> | ||
|
|
||
| # Martin LiΕ‘ka (https://github.com/marxin) | ||
| Martin LiΕ‘ka <mliska@suse.cz> | ||
|
|
||
| Matt Warrick <matt@documatt.com> | ||
|
|
||
| # Matthias Geier (https://github.com/mgeier) | ||
|
|
||
| # Nils K (https://github.com/septatrix) | ||
| Nils Kattenbeck <nilskemail@gmail.com> <24257556+Septatrix@users.noreply.github.com> | ||
|
|
||
| Oleg Hoefling <oleg.hoefling@gmail.com> | ||
|
|
||
| # PaweΕ BudzyΕski (https://github.com/pbudzyns) | ||
| PaweΕ BudzyΕski <pawel.budzynski@cern.ch> | ||
| PaweΕ BudzyΕski <pawel.budzynski19+git@gmail.com> | ||
|
|
||
| Pradyun Gedam <pradyunsg@users.noreply.github.com> | ||
| Pradyun Gedam <pradyunsg@users.noreply.github.com> <pradyunsg@gmail.com> | ||
| Pradyun Gedam <pradyunsg@users.noreply.github.com> <3275593+pradyunsg@users.noreply.github.com> | ||
|
|
||
| # Robert Lehmann (https://github.com/lehmannro) | ||
| Rob Ruana <rob@robruana.com> <rob@relentlessidiot.com> | ||
| Rob Ruana <rob@robruana.com> <robruana@magfest.org> | ||
|
|
||
| Santos Gallegos <stsewd@protonmail.com> <santos_g@outlook.com> | ||
|
|
||
| Seth Girvin <sethg@geographika.co.uk> | ||
|
|
||
| # Shirou WAKAYAMA (https://github.com/shirou) | ||
| Shirou WAKAYAMA <shirou.faw@gmail.com> | ||
|
|
||
| # Stephen Finucane (https://github.com/stephenfin) | ||
|
|
||
| # Takayuki SHIMIZUKAWA (https://github.com/shimizukawa) | ||
| Takayuki SHIMIZUKAWA <shimizukawa@gmail.com> | ||
|
|
||
| # Takeshi KOMIYA (https://github.com/tk0miya) | ||
| Takeshi KOMIYA <i.tkomiya@gmail.com> | ||
| Takeshi KOMIYA <i.tkomiya@gmail.com> <tk0miya@users.noreply.github.com> | ||
|
|
||
| # Timotheus Kampik (https://github.com/TimKam) | ||
| Timotheus Kampik <timotheus.kampik@gmail.com> <timotheus.kampik@signavio.com> | ||
|
|
||
| # Tim Hoffmann (https://github.com/timhoffm) | ||
|
|
||
| Thomas Kluyver <thomas@kluyver.me.uk> <takowl@gmail.com> | ||
|
|
||
| # Wout de Nolf (https://github.com/woutdenolf) | ||
| Wout de Nolf <woutdenolf@users.sf.net> | ||
|
|
||
| # Yoshiki Shibukawa (https://github.com/shibukawa) | ||
| Yoshiki Shibukawa <yoshiki@shibu.jp> <shibukawa.yoshiki@dena.jp> | ||
| Yoshiki Shibukawa <yoshiki@shibu.jp> <yoshiki at shibu.jp> | ||
|
|
||
| Zack Cerza <zack@cerza.org> <zack@redhat.com> |
ca0fc7aThere 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
2589111+jfbu@users.noreply.github.com. But, one needs to look a bit in the commit history or t usegit shortlogso indeed there is no way I can prevent harversters to get it, but here with this.mailmapwe have the situation that anyone doing agit cloneof Sphinx will have the data of a private email whereas my GitHub is configured to keep it private!ca0fc7aThere 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
ca0fc7aThere 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 under2589111+jfbu@users.noreply.github.comor somejfbu@usersvariant (fromgit log --oneline --author="jfbu@users" | wc -lafter 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 to2589111+jfbu@users.noreply.github.comby 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
ca0fc7aThere 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