From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Beller Subject: [PATCH] .mailmap: Map email addresses to names Date: Fri, 12 Jul 2013 13:49:29 +0200 Message-ID: <1373629769-23647-2-git-send-email-stefanbeller@googlemail.com> References: <7vzjttq9wk.fsf@alter.siamese.dyndns.org> <1373629769-23647-1-git-send-email-stefanbeller@googlemail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Stefan Beller To: Junio C Hamano , git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jul 12 13:49:49 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Uxbr8-0005J2-VB for gcvg-git-2@plane.gmane.org; Fri, 12 Jul 2013 13:49:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932892Ab3GLLtn convert rfc822-to-quoted-printable (ORCPT ); Fri, 12 Jul 2013 07:49:43 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:44320 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932834Ab3GLLtk (ORCPT ); Fri, 12 Jul 2013 07:49:40 -0400 Received: by mail-wg0-f46.google.com with SMTP id c11so7918193wgh.13 for ; Fri, 12 Jul 2013 04:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ngIfmxXkTcaDA/CDzc1hhksgMN6FE4RLgADLtLhv3AQ=; b=ZWwYzmYItT9xA4oDWqFagySkylb2OIaUy7UTV5aHIRjIc8nYFle95yBkc0FTkWLP1r dS7KcqMqR+vp6e0uGBPcle3fR7KhNewR1jonqip6Vx24xeyz0i3AnHNSt7T8ywZUktJD 5Mu6zzqVnP0oW4eUCwYEYLj66qX6M5PDLk5+WzlaEhcnMuTUm+6/WRSrcCamgShI0GRI lH2Ic+lustsE5JEqqK/+kPpgRGTbgU3HUPXbtb0OArJt1T0Ie9rzuvKVjo1vQe5Sh91S kLFP0KmxzwbWsmrHyKJhx/BzOEWUyT4wELPROWKAxEC/Bk8TwWilHcp9kctd0wwbGWIC v65Q== X-Received: by 10.194.240.201 with SMTP id wc9mr23983129wjc.1.1373629778842; Fri, 12 Jul 2013 04:49:38 -0700 (PDT) Received: from localhost (ip-109-91-109-128.unitymediagroup.de. [109.91.109.128]) by mx.google.com with ESMTPSA id j20sm2898370wie.7.2013.07.12.04.49.37 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Jul 2013 04:49:38 -0700 (PDT) X-Mailer: git-send-email 1.8.3.2.636.g7943f03 In-Reply-To: <1373629769-23647-1-git-send-email-stefanbeller@googlemail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 =2Emailmap file, it has also been sorted alphabetically. (which explains the removals, which are added 3 lines later on again) While the most changes happen at the email addresses, we also have a name change in here. Karl Hasselstr=C3=B6m 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=3D""; print }' |sort |uniq -d > = mailmapdoubles while read line ; do # remove leading whitespace trimmed=3D$(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=3D""; print }' |sort |uniq -d --- Signed-off-by: Stefan Beller --- .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++--------= -------- 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/.mailmap b/.mailmap index 345cce6..1179767 100644 --- a/.mailmap +++ b/.mailmap @@ -5,99 +5,146 @@ # same person appearing not to be so. # =20 -Alex Benn=C3=A9e +Alejandro R. Sede=C3=B1o Alexander Gavrilov +Alex Benn=C3=A9e +Alex Riesen +Alex Riesen +Alex Riesen +Anders Kaseorg +Anders Kaseorg Aneesh Kumar K.V +anonymous +anonymous +Brandon Casey Brian M. Carlson Cheng Renquan Chris Shoemaker -Dan Johnson Dana L. How Dana L. How Daniel Barkalow +Dan Johnson David D. Kilzer David K=C3=A5gedal +David Reiss David S. Miller Deskin Miller Dirk S=C3=BCsserott Eric S. Raymond Erik Faye-Lund -Fredrik Kuivinen +Florian Achleitner +Franck Bui-Huu +Frank Lichtenheld +Frank Lichtenheld Fr=C3=A9d=C3=A9ric Heitzmann +Fredrik Kuivinen +Han-Wen Nienhuys Han-Wen Nienhuys H. Merijn Brand H.Merijn Brand -H. Peter Anvin -H. Peter Anvin -H. Peter Anvin Horst H. von Brand +H. Peter Anvin +H. Peter Anvin +H. Peter Anvin +H. Peter Anvin =C4=B0smail D=C3=B6nmez Jakub Nar=C4=99bski -Jay Soffian +Jay Soffian +J. Bruce Fields +J. Bruce Fields +J. Bruce Fields Jeff King Joachim Berdal Haga +Johannes Schindelin Johannes Sixt -Johannes Sixt Johannes Sixt +Johannes Sixt +Jonathan Nieder Jon Loeliger Jon Seymour -Jonathan Nieder Junio C Hamano -Junio C Hamano -Junio C Hamano -Junio C Hamano Junio C Hamano Junio C Hamano +Junio C Hamano +Junio C Hamano Junio C Hamano -Karl Hasselstr=C3=B6m -Kevin Leung +Junio C Hamano +Karl Wiberg Karl Hasselstr=C3=B6m +Karl Wiberg Karl Hasselstr=C3=B6m +Kay Sievers +Kay Sievers +Keith Cascio Kent Engstrom +Kevin Leung +Kirill Smelkov +Kirill Smelkov Lars Doelle Lars Doelle Li Hong -Linus Torvalds -Linus Torvalds -Linus Torvalds Linus Torvalds +Linus Torvalds +Linus Torvalds Linus Torvalds Linus Torvalds +Linus Torvalds Lukas Sandstr=C3=B6m Marc-Andr=C3=A9 Lureau Mark Rada Martin Langhoff Martin von Zweigbergk +Matthias Kestenholz +Matthias Urlichs +Matthias Urlichs Michael Coleman Michael J Gruber +Michael Witten +Michael Witten Michael W. Olson Michele Ballabio +Miklos Vajna +Namhyung Kim +Namhyung Kim Nanako Shiraishi Nanako Shiraishi Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy -Peter Krefting +Pascal Obry +Pascal Obry +Paul Mackerras +Paul Mackerras Peter Krefting +Peter Krefting Petr Baudis +Petr Baudis Philippe Bruhat Ralf Thielow Ramsay Allan Jones Ren=C3=A9 Scharfe Robert Fitzsimons Robert Zeh +Robin Rosenberg +Salikh Zakirov Sam Vilain -Santi B=C3=A9jar +Santi B=C3=A9jar Sean Estabrooks +Sebastian Schuberth Shawn O. Pearce -Steven Grimm +Stephen Boyd +Steven Grimm +Sven Verdoolaege +Sven Verdoolaege Tay Ray Chuan Theodore Ts'o +Thomas Ackermann Thomas Rast +Timo Hirvonen +Toby Allsopp Tony Luck -Uwe Kleine-K=C3=B6nig -Uwe Kleine-K=C3=B6nig Uwe Kleine-K=C3=B6nig +Uwe Kleine-K=C3=B6nig +Uwe Kleine-K=C3=B6nig Uwe Kleine-K=C3=B6nig Uwe Kleine-K=C3=B6nig Ville Skytt=C3=A4 Vitaly "_Vi" Shukela William Pursell YOSHIFUJI Hideaki -anonymous -anonymous + --=20 1.8.3.2.636.g7943f03