[PATCH] fixup! Update .mailmap using scripts/mailmapper

[PATCH] fixup! Update .mailmap using scripts/mailmapper

[Antony Pavlov]

MIN_COMMITS = 1 in scripts/mailmapper give us additional
.mailman strings:

+Franck Jullien <franck.jullien@gmail.com>
+Jin Zhengxiong <Jason.Jin@freescale.com>
+Marc Reilly <marc@cpdesign.com.au>
+Nishanth Menon <x0nishan@ti.com>
+Raphaël Poggi <poggi.raph@gmail.com>
+Vicente Bergas <vicencb@gmail.com>
+Wjatscheslaw Stoljarski <wjatscheslaw.stoljarski@kiwigrid.com>
+gregory hermant <gregory.hermant@calao-systems.com>
+shravan <shravan.k@phytec.in>

I suppose these 9 strings can't make our .mailman file too big.

Also some .mailmap lines are added by hand:

+Robert Schwebel <rsc@thebe.(none)>
+Silvio Fricke <sfricke@data-modul.com>

Alas I don't know how to fix Markus Klotzbuecher's
<Markus Klotzb<FC>mk@pollux.(none)> mail address
with latin-1 character inside it.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 .mailmap | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.mailmap b/.mailmap
index e8e81a0..2e51c38 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,7 +10,18 @@
 
 Alexander Shiyan <shc@milas.spb.ru>
 Eric Bénard <eric@eukrea.com>
+Franck Jullien <franck.jullien@gmail.com>
+Jin Zhengxiong <Jason.Jin@freescale.com>
 Juergen Beisert <jbe@pengutronix.de>
+Marc Reilly <marc@cpdesign.com.au>
+Nishanth Menon <x0nishan@ti.com>
+Raphaël Poggi <poggi.raph@gmail.com>
+Robert Schwebel <rsc@thebe.(none)>
 Sascha Hauer <sascha@nomad.localdomain>
+Silvio Fricke <sfricke@data-modul.com>
 Stefan Roese <stroese>
+Vicente Bergas <vicencb@gmail.com>
+Wjatscheslaw Stoljarski <wjatscheslaw.stoljarski@kiwigrid.com>
 Wolfgang Denk <wdenk>
+gregory hermant <gregory.hermant@calao-systems.com>
+shravan <shravan.k@phytec.in>
-- 
2.1.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! Update .mailmap using scripts/mailmapper

[Nishanth Menon]

On 10/16/2014 12:28 AM, Antony Pavlov wrote:
> +Nishanth Menon<x0nishan@ti.com>
Could you use Nishanth Menon <nm@ti.com> ? that has been my updated mail 
address for a few years now.

Thanks and Regards,
Nishanth Menon

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! Update .mailmap using scripts/mailmapper

[Antony Pavlov]

On Thu, 16 Oct 2014 09:31:26 -0500
Nishanth Menon <nm@ti.com> wrote:

> On 10/16/2014 12:28 AM, Antony Pavlov wrote:
> > +Nishanth Menon<x0nishan@ti.com>
> Could you use Nishanth Menon <nm@ti.com> ? that has been my updated mail 
> address for a few years now.

Please see this quote from git-shortlog man page:

     The .mailmap feature is used to coalesce together commits by the same person in the
     shortlog, where their name and/or email address was spelled differently.

     ...

     In the simple form, each line in the file consists of the canonical real name of an
     author, whitespace, and an email address used in the commit (enclosed by < and >) to
     map to the name.

Also please see this git-log output:

  $ git log --author="Menon"  | grep ^Author: | uniq
  Author: Nishanth Menon <nm@ti.com>
  Author: Nishanth Menon <menon.nishanth@gmail.com>
  Author: Nishanth Menon <x0nishan@ti.com>
  Author: Menon, Nishanth <x0nishan@ti.com>
  Author: Nishanth Menon <x0nishan@ti.com>

This string in the .mailmap file
> > +Nishanth Menon <x0nishan@ti.com>

is used only for mapping "Menon, Nishanth" -> "Nishanth Menon".

Here is git-shortlog output without this string:

$ git shortlog -n -s --author="Menon" 
    35  Nishanth Menon
     4  Menon, Nishanth

So there is no need to add additional string containing <nm@ti.com> to the .mailmap file.

-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! Update .mailmap using scripts/mailmapper

[Sascha Hauer]

On Thu, Oct 16, 2014 at 09:28:05AM +0400, Antony Pavlov wrote:
> MIN_COMMITS = 1 in scripts/mailmapper give us additional
> .mailman strings:
> 
> Alas I don't know how to fix Markus Klotzbuecher's
> <Markus Klotzb<FC>mk@pollux.(none)> mail address
> with latin-1 character inside it.
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>

Applied the original series and this fixup.

Thanks
  Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox