All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] .mailmap: Map email addresses to names
@ 2013-07-12 19:21 Stefan Beller
  2013-07-12 19:21 ` Stefan Beller
  2013-07-12 19:48 ` Junio C Hamano
  0 siblings, 2 replies; 10+ messages in thread
From: Stefan Beller @ 2013-07-12 19:21 UTC (permalink / raw)
  To: git, gitster, jrnieder; +Cc: Stefan Beller

Ok I am sending all confirmed changes now again
in one big patch, as the sorting was wrong.

Stefan Beller (1):
  .mailmap: Map email addresses to names

 .mailmap | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 110 insertions(+), 25 deletions(-)

-- 
1.8.3.2.790.g9192b0b

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] .mailmap: Map email addresses to names
@ 2013-07-12 17:29 Stefan Beller
  0 siblings, 0 replies; 10+ messages in thread
From: Stefan Beller @ 2013-07-12 17:29 UTC (permalink / raw)
  To: git; +Cc: Stefan Beller

The same kind of cleanup as sent earlier today
(2e2ae79df4fabea0157c5eb527b5396eb89185a1 locally here)

I asked all the people before, whether
they like their lines added. Many had
requests to change the order of the mail address.

When having this patch applied, you'll notice the
bug as described here
http://marc.info/?l=git&m=137364524514927&w=2
http://www.mail-archive.com/git@vger.kernel.org/msg31964.html
("Bug in .mailmap handling?", for example look for Knut Franke)

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1179767..1d6ba17 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@
 
 Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
 Alexander Gavrilov <angavrilov@gmail.com>
+Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
 Alex Bennée <kernel-hacker@bennee.com>
 Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
 Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
@@ -18,12 +19,15 @@ anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
+Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>
 Chris Shoemaker <c.shoemaker@cox.net>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>
 Daniel Barkalow <barkalow@iabervon.org>
 Dan Johnson <computerdruid@gmail.com>
+David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
 David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
@@ -31,7 +35,10 @@ David S. Miller <davem@davemloft.net>
 Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Eric S. Raymond <esr@thyrsus.com>
+Eric Blake <eblake@redhat.com> <ebb9@byu.net>
+Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
 Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
+Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
 Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
 Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
 Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
@@ -47,19 +54,25 @@ H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
 H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
 İsmail Dönmez <ismail@pardus.org.tr>
 Jakub Narębski <jnareb@gmail.com>
+Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
+Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jeff King <peff@peff.net> <peff@github.com>
+Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
+Jonathan del Strother <jon.delStrother@bestbefore.tv> <maillist@steelskies.com>
 Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
 Jon Loeliger <jdl@freescale.com>
-Jon Seymour <jon@blackcubes.dyndns.org>
+Jon Seymour <jon.seymour@gmail.com> <jon@blackcubes.dyndns.org>
+Josh Triplett <josh@joshtriplett.org> <josh@freedesktop.org>
+Josh Triplett <josh@joshtriplett.org> <josht@us.ibm.com>
 Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
 Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
 Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
@@ -71,11 +84,14 @@ Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@treskal.com>
 Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@yoghurt.hemma.treskal.com>
 Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
 Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
+Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
+Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
 Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
 Kent Engstrom <kent@lysator.liu.se>
 Kevin Leung <kevinlsk@gmail.com>
 Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
 Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
+Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Li Hong <leehong@pku.edu.cn>
@@ -85,11 +101,14 @@ Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
-Lukas Sandström <lukass@etek.chalmers.se>
+Lukas Sandström <luksan@gmail.com> <lukass@etek.chalmers.se>
+Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
 Marc-André Lureau <marcandre.lureau@gmail.com>
+Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
 Mark Rada <marada@uwaterloo.ca>
 Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
 Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
+Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
 Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
 Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
 Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
@@ -104,8 +123,11 @@ Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
 Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
+Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
+Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 <nico@fluxnic.net> <nico@cam.org>
+Paolo Bonzini <bonzini@gnu.org> <paolo.bonzini@lu.unisi.ch>
 Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
 Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
 Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
@@ -114,6 +136,7 @@ Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
 Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
 Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
 Petr Baudis <pasky@ucw.cz> <xpasky@machine>
+Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
@@ -145,6 +168,7 @@ Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
 Vitaly "_Vi" Shukela <public_vi@tut.by>
+W. Trevor King <wking@tremily.us> <wking@drexel.edu>
 William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 
-- 
1.8.3.2.790.g9192b0b

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 0/6] Corrections to the mailmap file
@ 2013-07-11 17:33 Junio C Hamano
  2013-07-12 11:49 ` [PATCH v2] " Stefan Beller
  0 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2013-07-11 17:33 UTC (permalink / raw)
  To: Stefan Beller; +Cc: git

Stefan Beller <stefanbeller@googlemail.com> writes:
>
> I noticed many duplicates in email addresses but having the same name by
> running:
>
>     # Finding out duplicates by comparing names:
>     git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
>
> Most of these entries are most probably the same person, but we cannot be 
> sure, as there might be different persons having the same name, then they
> are only distinguished by the mail address.
>
> However I suspect most of these to be the same person, having changed 
> mail addresses.
>
> Here comes an initial batch of corrections to the mailmap file, which
> maps people with email addresses of different capitalization onto
> the same entity.
> (Example Name@MIT.EDU is the same as Name@mit.edu)
>
> I intend to contact each of the persons individually and ask whether 
> just their mail address changed, or if they are indeed different persons.

Has anything happen to this topic sice you posted?

I think:

 - .(none) is obviously bad, and we can fix without waiting for
   responses as long as we know the replacement address is the
   address from the list we usually see on the list (3).

 - Domain part is defined to be case insensitive (e.g. @mit.edu vs
   @MIT.EDU), so both forms are equally valid.  The owner of the
   address may have preferences (1 and 4), though.

   For this, we could just declare we downcase the domain part.

 - The local-part, even though RFC 2821 says "local-part of a
   mailbox MUST BE treated as case sensitive", is often case
   insensitive, and User.Name@domain and user.name@domain often name
   the same mailbox.  The owner of the address may have preferences
   (5 and 6), though.

   For this, we could just declare we Camel.Case the local part,
   after making sure Camel.Case@domain has been used by the owner of
   the address on this list.

So where does that leave us?

We can apply without waiting:

  1: downcase domain
  3: .(none) and we know paulus@samba.org
  4: downcase domain
  5: We recently saw Dshco calls himself <Johannes.Schindelin@domain>.
  6: The latest one from Nov 2009 uses <Toby.Allsopp@domain>.

The only possibly iffy one is Alex Riesen, but <raa.lkml@domain>
seems to be the one he uses here, so I think 2. is also fine.

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-07-12 20:00 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-12 19:21 [PATCH] .mailmap: Map email addresses to names Stefan Beller
2013-07-12 19:21 ` Stefan Beller
2013-07-12 20:00   ` Junio C Hamano
2013-07-12 19:48 ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2013-07-12 17:29 Stefan Beller
2013-07-11 17:33 [PATCH 0/6] Corrections to the mailmap file Junio C Hamano
2013-07-12 11:49 ` [PATCH v2] " Stefan Beller
2013-07-12 11:49   ` [PATCH] .mailmap: Map email addresses to names Stefan Beller
2013-07-12 16:31     ` Junio C Hamano
2013-07-12 18:57     ` Jonathan Nieder
2013-07-12 19:02       ` Stefan Beller
2013-07-12 19:10         ` Stefan Beller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.