Skip to content

Commit 94b410b

Browse files
stefanbellergitster
authored andcommitted
.mailmap: Map email addresses to names
People change email addresses quite often and sometimes forget to add their entry to the mailmap file. I have contacted lots of people, whose name occurs multiple times in the short log having different email addresses. The entries in the mailmap of this patch are either confirmed by them or are trivial. Trivial means different capitalisation of the domain (@MIT.EDU and @mit.edu) or the domain was localhost, (none) or @Local. Additionally to adding (name, email) mappings to the .mailmap file, it has also been sorted ("LC_ALL=C /usr/bin/sort", byte-value sort). While the most changes happen at the email addresses, we also have a name change in here. Karl Hasselström is now known as Karl Wiberg due to marriage. Congratulations! To find out whom to contact I used the following small script: #!/bin/bash git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles while read line ; do # remove leading whitespace trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g') echo "git shortlog -sne | grep \""$trimmed"\"" done < mailmapdoubles > mailmapdoubles2 sh mailmapdoubles2 rm mailmapdoubles rm mailmapdoubles2 Also interesting for similar tasks are these snippets: # Finding out duplicates by comparing email addresses: git shortlog -sne |awk '{ print $NF }' |sort |uniq -d # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 911011a commit 94b410b

File tree

1 file changed

+110
-25
lines changed

1 file changed

+110
-25
lines changed

.mailmap

Lines changed: 110 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,99 +5,184 @@
55
# same person appearing not to be so.
66
#
77

8+
9+
Alejandro R. Sedeño <[email protected]> <[email protected]>
810
Alex Bennée <[email protected]>
11+
12+
13+
14+
915
Alexander Gavrilov <[email protected]>
16+
17+
18+
1019
Aneesh Kumar K.V <[email protected]>
20+
21+
1122
Brian M. Carlson <[email protected]>
23+
24+
1225
Cheng Renquan <[email protected]>
1326
Chris Shoemaker <[email protected]>
1427
Dan Johnson <[email protected]>
1528
Dana L. How <[email protected]>
1629
Dana L. How <[email protected]>
1730
Daniel Barkalow <[email protected]>
31+
1832
David D. Kilzer <[email protected]>
1933
David Kågedal <[email protected]>
34+
David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)>
2035
David S. Miller <[email protected]>
2136
Deskin Miller <[email protected]>
2237
Dirk Süsserott <[email protected]>
38+
39+
2340
Eric S. Raymond <[email protected]>
2441
42+
Eyvind Bernhardsen <[email protected]> <[email protected]>
43+
Florian Achleitner <[email protected]> <[email protected]>
44+
45+
46+
2547
Fredrik Kuivinen <[email protected]>
2648
Frédéric Heitzmann <[email protected]>
2749
H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]>
28-
H. Peter Anvin <[email protected]>
29-
H. Peter Anvin <[email protected]>
30-
H. Peter Anvin <[email protected]>
50+
51+
52+
53+
54+
Han-Wen Nienhuys <[email protected]> Han-Wen Nienhuys <[email protected]>
3155
Horst H. von Brand <[email protected]>
32-
İsmail Dönmez <[email protected]>
56+
57+
58+
3359
Jakub Narębski <[email protected]>
34-
Jay Soffian <[email protected]>
60+
61+
62+
3563
64+
3665
Joachim Berdal Haga <[email protected]>
37-
38-
66+
Johannes Schindelin <[email protected]> <[email protected]>
3967
68+
69+
4070
Jon Loeliger <[email protected]>
41-
Jon Seymour <[email protected]>
42-
Jonathan Nieder <[email protected]>
71+
72+
73+
Jonathan del Strother <[email protected]> <[email protected]>
74+
75+
76+
4377
44-
45-
46-
4778
4879
80+
81+
4982
50-
Karl Hasselström <[email protected]>
51-
Kevin Leung <[email protected]>
83+
84+
Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
85+
Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
86+
87+
88+
89+
Kay Sievers <[email protected]> <kay@mam.(none)>
90+
5291
Kent Engstrom <[email protected]>
92+
Kevin Leung <[email protected]>
93+
94+
95+
5396
Lars Doelle <lars.doelle@on-line ! de>
5497
Lars Doelle <[email protected]>
5598
56-
57-
58-
5999
60-
100+
101+
61102
Linus Torvalds <[email protected]> <[email protected].(none)>
62-
Lukas Sandström <[email protected]>
103+
104+
105+
106+
63107
Marc-André Lureau <[email protected]>
108+
109+
64110
Mark Rada <[email protected]>
65111
66112
Martin von Zweigbergk <[email protected]> <[email protected]>
113+
114+
115+
Matthias Kestenholz <[email protected]> <[email protected]>
116+
Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
117+
67118
Michael Coleman <[email protected]>
68119
69120
Michael W. Olson <[email protected]>
121+
122+
70123
Michele Ballabio <[email protected]>
124+
125+
126+
71127
Nanako Shiraishi <[email protected]>
72128
Nanako Shiraishi <[email protected]>
129+
130+
73131
Nguyễn Thái Ngọc Duy <[email protected]>
74-
75-
132+
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
133+
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
134+
135+
136+
137+
138+
Paul Mackerras <[email protected]> <paulus@dorrigo.(none)>
139+
Paul Mackerras <[email protected]> <paulus@pogo.(none)>
76140
141+
77142
143+
Petr Baudis <[email protected]> <xpasky@machine>
144+
145+
Philip Jägenstedt <[email protected]> <[email protected]>
146+
Philipp A. Hartmann <[email protected]> <[email protected]>
78147
Philippe Bruhat <[email protected]>
79148
80149
Ramsay Allan Jones <[email protected]>
81150
René Scharfe <[email protected]>
82151
Robert Fitzsimons <[email protected]>
83152
Robert Zeh <[email protected]>
84-
Sam Vilain <[email protected]>
85-
Santi Béjar <[email protected]>
153+
154+
155+
156+
86157
Sean Estabrooks <[email protected]>
158+
Sebastian Schuberth <[email protected]> <[email protected]>
87159
Shawn O. Pearce <[email protected]>
88-
Steven Grimm <[email protected]>
160+
161+
162+
163+
164+
89165
Tay Ray Chuan <[email protected]>
166+
90167
Theodore Ts'o <[email protected]>
168+
91169
170+
171+
172+
92173
Tony Luck <[email protected]>
93-
Uwe Kleine-König <[email protected]>
174+
175+
94176
Uwe Kleine-König <[email protected]>
177+
Uwe Kleine-König <[email protected]>
95178
Uwe Kleine-König <[email protected]>
96179
Uwe Kleine-König <[email protected]>
97180
Uwe Kleine-König <[email protected]>
98181
Ville Skyttä <[email protected]>
99182
Vitaly "_Vi" Shukela <[email protected]>
183+
100184
William Pursell <[email protected]>
101185
YOSHIFUJI Hideaki <[email protected]>
102186
anonymous <[email protected]>
103187
anonymous <[email protected]>
188+
İsmail Dönmez <[email protected]>

0 commit comments

Comments
 (0)