{"thread":{"id":"20126","subject":"mailmap distinguishing names","startedAt":"2009-07-15T22:22:08Z","lastAt":"2009-07-16T18:41:16Z","messageCount":5,"participants":["Ondrej Certik","Kirill Smelkov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"118050","messageId":"85b5c3130907151522x1009a796tced7726d9be4ca7d@mail.gmail.com","threadId":"20126","inReplyTo":null,"subject":"mailmap distinguishing names","fromName":"Ondrej Certik","fromEmail":"ondrej@certik.cz","sentAt":"2009-07-15T22:22:08Z","receivedAt":"2009-07-15T22:22:08Z","isPatch":false,"sender":{"key":"ondrej@certik.cz","avatar":"https://gravatar.com/avatar/106d05822138a98292e09d1580dbe8f27e05faecd87f13d5d58d889d0687771c?d=mp&s=160"},"body":"Hi,\n\nI know how to use mailmap to map names to email addresses, however,\nwhat if we have some old commits that look like:\n\ncommit 1815ccf8ea8a7d99736d9b15c10d2ddf41162faf\nAuthor: ondrej.certik <devnull@localhost>\nDate:   Sat Oct 6 01:57:03 2007 +0000\n\n    test for a series bug 364 added, but XFAILed, because sometimes it works, so\n\ncommit ef95d618e1fda2dc6b50a0edf343a7b321467527\nAuthor: kirill.smelkov <devnull@localhost>\nDate:   Fri Oct 5 20:10:04 2007 +0000\n\n    pprint: add support for multile indexes in unicode mode\n\ncommit 7e74ebdf2701f0ab213a6e5ba47b7860fcf90cff\nAuthor: fredrik.johansson <devnull@localhost>\nDate:   Fri Oct 5 16:41:04 2007 +0000\n\n    add abc module\n\n\n\nE.g. for some reason the addresses are <devnull@localhost>, but the\nnames are correct (svn names). Then \"git shortlog -ns\" shows things\nlike:\n\n   654  Ondrej Certik\n   322  Kirill Smelkov\n   268  ondrej.certik\n   208  Mateusz Paprocki\n    74  fredrik.johansson\n\nis there some way to join \"ondrej.certik\" with \"Ondrej Certik\"? If the\nemail address for ondrej.certik was some better one, it'd be easy, but\nsince it's the same for all the old committers, maybe the only way is\nto rewrite our history and fix this. But I just wanted to check if\nthere is some other way too.\n\nThanks,\nOndrej\n"},{"id":"118103","messageId":"20090716085532.GA8843@landau.phys.spbu.ru","threadId":"20126","inReplyTo":"85b5c3130907151522x1009a796tced7726d9be4ca7d@mail.gmail.com","subject":"Re: mailmap distinguishing names","fromName":"Kirill Smelkov","fromEmail":"kirr@landau.phys.spbu.ru","sentAt":"2009-07-16T08:55:32Z","receivedAt":"2009-07-16T08:55:32Z","isPatch":false,"sender":{"key":"kirr@navytux.spb.ru","avatar":"https://gravatar.com/avatar/cf3445fdad1849941e17ab25bf1ee7c5ea1be2deb444be25ff5f36b0e50a985f?d=mp&s=160"},"body":"On Wed, Jul 15, 2009 at 04:22:08PM -0600, Ondrej Certik wrote:\n> Hi,\n> \n> I know how to use mailmap to map names to email addresses, however,\n> what if we have some old commits that look like:\n> \n> commit 1815ccf8ea8a7d99736d9b15c10d2ddf41162faf\n> Author: ondrej.certik <devnull@localhost>\n> Date:   Sat Oct 6 01:57:03 2007 +0000\n> \n>     test for a series bug 364 added, but XFAILed, because sometimes it works, so\n> \n> commit ef95d618e1fda2dc6b50a0edf343a7b321467527\n> Author: kirill.smelkov <devnull@localhost>\n> Date:   Fri Oct 5 20:10:04 2007 +0000\n> \n>     pprint: add support for multile indexes in unicode mode\n> \n> commit 7e74ebdf2701f0ab213a6e5ba47b7860fcf90cff\n> Author: fredrik.johansson <devnull@localhost>\n> Date:   Fri Oct 5 16:41:04 2007 +0000\n> \n>     add abc module\n> \n> \n> \n> E.g. for some reason the addresses are <devnull@localhost>, but the\n> names are correct (svn names). Then \"git shortlog -ns\" shows things\n> like:\n> \n>    654  Ondrej Certik\n>    322  Kirill Smelkov\n>    268  ondrej.certik\n>    208  Mateusz Paprocki\n>     74  fredrik.johansson\n> \n> is there some way to join \"ondrej.certik\" with \"Ondrej Certik\"? If the\n\nYou just do\n\n    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>\n\n\nin .mailmap\n\nSee Documentation/mailmap.txt for details\n"},{"id":"118120","messageId":"85b5c3130907161009k64029bd3t23155040728d9d9@mail.gmail.com","threadId":"20126","inReplyTo":"20090716085532.GA8843@landau.phys.spbu.ru","subject":"Re: mailmap distinguishing names","fromName":"Ondrej Certik","fromEmail":"ondrej@certik.cz","sentAt":"2009-07-16T17:09:06Z","receivedAt":"2009-07-16T17:09:06Z","isPatch":false,"sender":{"key":"ondrej@certik.cz","avatar":"https://gravatar.com/avatar/106d05822138a98292e09d1580dbe8f27e05faecd87f13d5d58d889d0687771c?d=mp&s=160"},"body":"Hi Kirill!\n\n>\n> You just do\n>\n>    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>\n>\n>\n> in .mailmap\n>\n> See Documentation/mailmap.txt for details\n\nMany thanks for help, that's exactly what I want.\n\nOnly I think I am probably doing something stupid, because I can't get\nit to work (I use the latest git from git),\nI put this into the root directory:\n\n$ cat .mailmap\nOndrej Certik <...@...>   ondrej.certik <devnull@localhost>\n\n(if have my real address instead of the ...@..), and:\n\n$ git shortlog -ns\n  654  Ondrej Certik\n  322  Kirill Smelkov\n  268  ondrej.certik\n[...]\n\nit still shows ondrej.certik.  I will try to debug it why it doesn't\nwork, I think according to the documentation it should work.\n\nOndrej\n"},{"id":"118121","messageId":"20090716174313.GA10298@landau.phys.spbu.ru","threadId":"20126","inReplyTo":"85b5c3130907161009k64029bd3t23155040728d9d9@mail.gmail.com","subject":"Re: mailmap distinguishing names","fromName":"Kirill Smelkov","fromEmail":"kirr@landau.phys.spbu.ru","sentAt":"2009-07-16T17:43:14Z","receivedAt":"2009-07-16T17:43:14Z","isPatch":false,"sender":{"key":"kirr@navytux.spb.ru","avatar":"https://gravatar.com/avatar/cf3445fdad1849941e17ab25bf1ee7c5ea1be2deb444be25ff5f36b0e50a985f?d=mp&s=160"},"body":"On Thu, Jul 16, 2009 at 11:09:06AM -0600, Ondrej Certik wrote:\n> Hi Kirill!\n> \n> >\n> > You just do\n> >\n> >    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>\n> >\n> >\n> > in .mailmap\n> >\n> > See Documentation/mailmap.txt for details\n> \n> Many thanks for help, that's exactly what I want.\n> \n> Only I think I am probably doing something stupid, because I can't get\n> it to work (I use the latest git from git),\n> I put this into the root directory:\n> \n> $ cat .mailmap\n> Ondrej Certik <...@...>   ondrej.certik <devnull@localhost>\n> \n> (if have my real address instead of the ...@..), and:\n> \n> $ git shortlog -ns\n>   654  Ondrej Certik\n>   322  Kirill Smelkov\n>   268  ondrej.certik\n> [...]\n> \n> it still shows ondrej.certik.  I will try to debug it why it doesn't\n> work, I think according to the documentation it should work.\n\nIt does work with the following mailmap:\n\n    Ondrej Certik <ondrej@certik.cz>    ondrej.certik <devnull@localhost>\n\nbefore:\n\n$ git shortlog -s | grep -i certik\n   654  Ondrej Certik\n   268  ondrej.certik\n\n\nafter:\n\n$ git shortlog -s | grep -i certik\n   922  Ondrej Certik\n"},{"id":"118126","messageId":"85b5c3130907161141y59d6888dhe9d0c483fd477e8@mail.gmail.com","threadId":"20126","inReplyTo":"20090716174313.GA10298@landau.phys.spbu.ru","subject":"Re: mailmap distinguishing names","fromName":"Ondrej Certik","fromEmail":"ondrej@certik.cz","sentAt":"2009-07-16T18:41:16Z","receivedAt":"2009-07-16T18:41:16Z","isPatch":false,"sender":{"key":"ondrej@certik.cz","avatar":"https://gravatar.com/avatar/106d05822138a98292e09d1580dbe8f27e05faecd87f13d5d58d889d0687771c?d=mp&s=160"},"body":"On Thu, Jul 16, 2009 at 11:43 AM, Kirill\nSmelkov<kirr@landau.phys.spbu.ru> wrote:\n> On Thu, Jul 16, 2009 at 11:09:06AM -0600, Ondrej Certik wrote:\n>> Hi Kirill!\n>>\n>> >\n>> > You just do\n>> >\n>> >    Ondrej Certik <...@...>   ondrej.certik  <devnull@localhost>\n>> >\n>> >\n>> > in .mailmap\n>> >\n>> > See Documentation/mailmap.txt for details\n>>\n>> Many thanks for help, that's exactly what I want.\n>>\n>> Only I think I am probably doing something stupid, because I can't get\n>> it to work (I use the latest git from git),\n>> I put this into the root directory:\n>>\n>> $ cat .mailmap\n>> Ondrej Certik <...@...>   ondrej.certik <devnull@localhost>\n>>\n>> (if have my real address instead of the ...@..), and:\n>>\n>> $ git shortlog -ns\n>>   654  Ondrej Certik\n>>   322  Kirill Smelkov\n>>   268  ondrej.certik\n>> [...]\n>>\n>> it still shows ondrej.certik.  I will try to debug it why it doesn't\n>> work, I think according to the documentation it should work.\n>\n> It does work with the following mailmap:\n>\n>    Ondrej Certik <ondrej@certik.cz>    ondrej.certik <devnull@localhost>\n>\n> before:\n>\n> $ git shortlog -s | grep -i certik\n>   654  Ondrej Certik\n>   268  ondrej.certik\n>\n>\n> after:\n>\n> $ git shortlog -s | grep -i certik\n>   922  Ondrej Certik\n\n\nNow it works! Many thanks, I must have been doing something really stupid.\n\nOndrej\n"}]}