Re: mailmap distinguishing names

From: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Date: Jul 16, 2009, 08:55 UTC
Message-ID: <20090716085532.GA8843@landau.phys.spbu.ru>
In-Reply-To: <85b5c3130907151522x1009a796tced7726d9be4ca7d@mail.gmail.com>

On Wed, Jul 15, 2009 at 04:22:08PM -0600, Ondrej Certik wrote:

Show 36 quoted lines

> Hi,
> 
> I know how to use mailmap to map names to email addresses, however,
> what if we have some old commits that look like:
> 
> commit 1815ccf8ea8a7d99736d9b15c10d2ddf41162faf
> Author: ondrej.certik <devnull@localhost>
> Date:   Sat Oct 6 01:57:03 2007 +0000
> 
>     test for a series bug 364 added, but XFAILed, because sometimes it works, so
> 
> commit ef95d618e1fda2dc6b50a0edf343a7b321467527
> Author: kirill.smelkov <devnull@localhost>
> Date:   Fri Oct 5 20:10:04 2007 +0000
> 
>     pprint: add support for multile indexes in unicode mode
> 
> commit 7e74ebdf2701f0ab213a6e5ba47b7860fcf90cff
> Author: fredrik.johansson <devnull@localhost>
> Date:   Fri Oct 5 16:41:04 2007 +0000
> 
>     add abc module
> 
> 
> 
> E.g. for some reason the addresses are <devnull@localhost>, but the
> names are correct (svn names). Then "git shortlog -ns" shows things
> like:
> 
>    654  Ondrej Certik
>    322  Kirill Smelkov
>    268  ondrej.certik
>    208  Mateusz Paprocki
>     74  fredrik.johansson
> 
> is there some way to join "ondrej.certik" with "Ondrej Certik"? If the

You just do

    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>

in .mailmap

See Documentation/mailmap.txt for details