threads / discuss / 20126

mailmap distinguishing names

Subject: mailmap distinguishing names

## tl;dr

5 messages between Jul 15, 2009 and Jul 16, 2009.

replies: 4people: 2as markdown or json

Ondrej Certik· Jul 15, 2009, 22:22 UTC · lore

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 email address for ondrej.certik was some better one, it'd be easy, but since it's the same for all the old committers, maybe the only way is to rewrite our history and fix this. But I just wanted to check if there is some other way too.

Thanks, Ondrej

Kirill Smelkov· Jul 16, 2009, 08:55 UTC · re: Ondrej Certik · lore

Re: mailmap distinguishing names

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

Ondrej Certik· Jul 16, 2009, 17:09 UTC · re: Kirill Smelkov · lore

Re: mailmap distinguishing names

Hi Kirill!

Show 9 quoted lines

>
> You just do
>
>    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>
>
>
> in .mailmap
>
> See Documentation/mailmap.txt for details

Many thanks for help, that's exactly what I want.

Only I think I am probably doing something stupid, because I can't get it to work (I use the latest git from git), I put this into the root directory:

$ cat .mailmap Ondrej Certik <...@...> ondrej.certik <devnull@localhost>

(if have my real address instead of the ...@..), and:

$ git shortlog -ns
  654  Ondrej Certik
  322  Kirill Smelkov
  268  ondrej.certik
[...]

it still shows ondrej.certik. I will try to debug it why it doesn't work, I think according to the documentation it should work.

Ondrej

Kirill Smelkov· Jul 16, 2009, 17:43 UTC · re: Ondrej Certik · lore

Re: mailmap distinguishing names

On Thu, Jul 16, 2009 at 11:09:06AM -0600, Ondrej Certik wrote:

Show 31 quoted lines

> Hi Kirill!
> 
> >
> > You just do
> >
> >    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>
> >
> >
> > in .mailmap
> >
> > See Documentation/mailmap.txt for details
> 
> Many thanks for help, that's exactly what I want.
> 
> Only I think I am probably doing something stupid, because I can't get
> it to work (I use the latest git from git),
> I put this into the root directory:
> 
> $ cat .mailmap
> Ondrej Certik <...@...>   ondrej.certik <devnull@localhost>
> 
> (if have my real address instead of the ...@..), and:
> 
> $ git shortlog -ns
>   654  Ondrej Certik
>   322  Kirill Smelkov
>   268  ondrej.certik
> [...]
> 
> it still shows ondrej.certik.  I will try to debug it why it doesn't
> work, I think according to the documentation it should work.

It does work with the following mailmap:

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

before:

$ git shortlog -s | grep -i certik
   654  Ondrej Certik
   268  ondrej.certik

after:

$ git shortlog -s | grep -i certik
   922  Ondrej Certik

Ondrej Certik· Jul 16, 2009, 18:41 UTC · re: Kirill Smelkov · lore

Re: mailmap distinguishing names

On Thu, Jul 16, 2009 at 11:43 AM, Kirill Smelkov<kirr@landau.phys.spbu.ru> wrote:

Show 48 quoted lines

> On Thu, Jul 16, 2009 at 11:09:06AM -0600, Ondrej Certik wrote:
>> Hi Kirill!
>>
>> >
>> > You just do
>> >
>> >    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>
>> >
>> >
>> > in .mailmap
>> >
>> > See Documentation/mailmap.txt for details
>>
>> Many thanks for help, that's exactly what I want.
>>
>> Only I think I am probably doing something stupid, because I can't get
>> it to work (I use the latest git from git),
>> I put this into the root directory:
>>
>> $ cat .mailmap
>> Ondrej Certik <...@...>   ondrej.certik <devnull@localhost>
>>
>> (if have my real address instead of the ...@..), and:
>>
>> $ git shortlog -ns
>>   654  Ondrej Certik
>>   322  Kirill Smelkov
>>   268  ondrej.certik
>> [...]
>>
>> it still shows ondrej.certik.  I will try to debug it why it doesn't
>> work, I think according to the documentation it should work.
>
> It does work with the following mailmap:
>
>    Ondrej Certik <ondrej@certik.cz>    ondrej.certik <devnull@localhost>
>
> before:
>
> $ git shortlog -s | grep -i certik
>   654  Ondrej Certik
>   268  ondrej.certik
>
>
> after:
>
> $ git shortlog -s | grep -i certik
>   922  Ondrej Certik

Now it works! Many thanks, I must have been doing something really stupid.

Ondrej