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

[Antony Pavlov]

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

> On 10/16/2014 12:28 AM, Antony Pavlov wrote:
> > +Nishanth Menon<x0nishan at ti.com>
> Could you use Nishanth Menon <nm at 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 at ti.com>
  Author: Nishanth Menon <menon.nishanth at gmail.com>
  Author: Nishanth Menon <x0nishan at ti.com>
  Author: Menon, Nishanth <x0nishan at ti.com>
  Author: Nishanth Menon <x0nishan at ti.com>

This string in the .mailmap file
> > +Nishanth Menon <x0nishan at 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 at ti.com> to the .mailmap file.

-- 
Best regards,
  Antony Pavlov