From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] .mailmap: Map email addresses to names Date: Fri, 12 Jul 2013 09:31:31 -0700 Message-ID: <7vzjtrn3j0.fsf@alter.siamese.dyndns.org> References: <7vzjttq9wk.fsf@alter.siamese.dyndns.org> <1373629769-23647-1-git-send-email-stefanbeller@googlemail.com> <1373629769-23647-2-git-send-email-stefanbeller@googlemail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Stefan Beller X-From: git-owner@vger.kernel.org Fri Jul 12 18:31:41 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 1UxgFw-0004vb-DZ for gcvg-git-2@plane.gmane.org; Fri, 12 Jul 2013 18:31:41 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965013Ab3GLQbg convert rfc822-to-quoted-printable (ORCPT ); Fri, 12 Jul 2013 12:31:36 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:40597 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964992Ab3GLQbe convert rfc822-to-8bit (ORCPT ); Fri, 12 Jul 2013 12:31:34 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id F2F7C30FA6; Fri, 12 Jul 2013 16:31:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=kCaD+bVRPo30 uscni9ciXatgcPM=; b=Rf6UXZdKFpitMkKa0bgzvSu2bnehX4AxemplNJ3qwE1H VgNqH0GYZU67ODF/u8kzx+PlyzII/ScZos7vi3JQdJQFb6diWNrwzsKRc2Qc2cAd RB21G25+j6+60FPkqAtfWSg/fm66m/zBu2Fbbnffgu3h9A4OyZIK6HIOGqkskTo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=sasl; b=s5bdqw cY8WwR9a5NBFuMc4/K3KXFAhxRnEzv9y7gPoT5yG6afRDyQYDXGtBQz03V7RJ6CG T3nk5MwEmkUrada02kSQRLVyXoaBBeTw950NZxto7t2nh9WyoQJMXf1sT9a1F+kU pmW0EcEMXh6iM3UmnM/8akNktRqac20ip+2lA= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id E3F2A30FA5; Fri, 12 Jul 2013 16:31:33 +0000 (UTC) Received: from pobox.com (unknown [50.161.4.97]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id EF4E130FA1; Fri, 12 Jul 2013 16:31:32 +0000 (UTC) In-Reply-To: <1373629769-23647-2-git-send-email-stefanbeller@googlemail.com> (Stefan Beller's message of "Fri, 12 Jul 2013 13:49:29 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: 83541C22-EB10-11E2-9407-E84251E3A03C-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Stefan Beller writes: > 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 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 > --- Thanks, but please be careful about these three-dashes when sending the next batch. As you may have already guessed, Git cannot guess reliably which one of the abouve four three-dash lines is the end of the proposed log message, and cuts at the first one. > .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 > +