[PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Michael J Gruber]

With the current .mailmap, git shortlog shows the following for these:

    11	Deskin Miller
     3	Vitaly \"_Vi\" Shukela
     1	Alex Bennee
     1	Alex Bennée
     1	Deskin Miler
     1	Vitaly _Vi Shukela

Add (e-mail based qualified) entries to .mailmap to get:

    12	Deskin Miller
     4	Vitaly "_Vi" Shukela
     2	Alex Bennée

The Shukela spelling is based on the version used consistently in the s-o-b
lines of all his patches.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Sparked by the recent discussion on uuid etc. I did a few (manual) checks.
There seem to be 4 remaining "problematic" cases (Elrond, jidanni,
Kirill, Twiinz) but 3 are unique, and I don't think we strictly require
full names. Kirill may be one of several other Kirills.

http://repo.or.cz/w/git/mjg.git/commit/cd13e44f33c1f6bc9ec11903c3041199c9c464ee

(branch typo-fixes) in case of encoding problems

 .mailmap |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index 975e675..c507309 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@
 # same person appearing not to be so.
 #
 
+Alex Bennée <kernel-hacker@bennee.com>
 Alexander Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
@@ -15,6 +16,7 @@ Daniel Barkalow <barkalow@iabervon.org>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
 David S. Miller <davem@davemloft.net>
+Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Fredrik Kuivinen <freku045@student.liu.se>
 H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
@@ -59,6 +61,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
+Vitaly "_Vi" Shukela <public_vi@tut.by>
 William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>
-- 
1.7.0.2.358.g30511

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Junio C Hamano]

Michael J Gruber <git@drmicha.warpmail.net> writes:

> With the current .mailmap, git shortlog shows the following for these:

Thanks for doing the gruntwork; very much appreciated.

I'll backburner this and wait until the people who are described by these
entries say they want these entries in the .mailmap file.  If they do not
like the variant that your patch suggested, and if they care, then we will
get updates that should be applied.  Otherwise they themselves don't care,
so why should we ;-)?

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Nicolas Pitre]

On Sat, 20 Mar 2010, Junio C Hamano wrote:

> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
> > With the current .mailmap, git shortlog shows the following for these:
> 
> Thanks for doing the gruntwork; very much appreciated.
> 
> I'll backburner this and wait until the people who are described by these
> entries say they want these entries in the .mailmap file.  If they do not
> like the variant that your patch suggested, and if they care, then we will
> get updates that should be applied.  Otherwise they themselves don't care,
> so why should we ;-)?

I think at least one person (Michael) cared, so if the people described 
by those entries don't provide feedback then that means they don't care 
and you shouldn't wait after them to apply the patch including those 
entries.


Nicolas

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Michael J Gruber]

Nicolas Pitre venit, vidit, dixit 20.03.2010 19:10:
> On Sat, 20 Mar 2010, Junio C Hamano wrote:
> 
>> Michael J Gruber <git@drmicha.warpmail.net> writes:
>>
>>> With the current .mailmap, git shortlog shows the following for these:
>>
>> Thanks for doing the gruntwork; very much appreciated.
>>
>> I'll backburner this and wait until the people who are described by these
>> entries say they want these entries in the .mailmap file.  If they do not
>> like the variant that your patch suggested, and if they care, then we will
>> get updates that should be applied.  Otherwise they themselves don't care,
>> so why should we ;-)?
> 
> I think at least one person (Michael) cared, so if the people described 
> by those entries don't provide feedback then that means they don't care 
> and you shouldn't wait after them to apply the patch including those 
> entries.

Maybe I should have cc'ed Vitaly, the others are straight typo fixes.
(One may even argue that Vitaly's change is, too.) Smothering on the
backburner for a while, is fine, though ;)

I think for git.git it's simple enough to have "consistent" authorship
information, partly due to the scale, partly due to the fact that by
definition, submitters have a certain affluence with Git...

Also, if used without "-e", shortlog coalesces authors by full name. I
reckon this is the most common way it is used, and it's the mode for
which I provided cleanup.

If you distinguish by e-mail (-e) then there are many obvious multiple
entries, but it's not up to me to decide which is the main e-mail
address. One could take the latest one used, but some people distinguish
between work for hire (maybe for several employers) and private submissions.

Michael

[PATCH] .mailmap: Map the the first submissions of MJG by e-mail

[Michael J Gruber]

so that git shortlog with '-e' coalesces all my commits.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 .mailmap |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index c507309..a8091eb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,7 @@ Li Hong <leehong@pku.edu.cn>
 Lukas Sandström <lukass@etek.chalmers.se>
 Martin Langhoff <martin@catalyst.net.nz>
 Michael Coleman <tutufan@gmail.com>
+Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
 Michael W. Olson <mwolson@gnu.org>
 Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
-- 
1.7.0.2.358.g30511

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Junio C Hamano]

Michael J Gruber <git@drmicha.warpmail.net> writes:

> Maybe I should have cc'ed Vitaly, the others are straight typo fixes.
> (One may even argue that Vitaly's change is, too.) Smothering on the
> backburner for a while, is fine, though ;)

Nico is right; what I wrote sounded that the patch will be forever on hold
until I get all three acks, but that wasn't my intention.

> Also, if used without "-e", shortlog coalesces authors by full name. I
> reckon this is the most common way it is used, and it's the mode for
> which I provided cleanup.
>
> If you distinguish by e-mail (-e) then there are many obvious multiple
> entries, but it's not up to me to decide which is the main e-mail
> address. One could take the latest one used, but some people distinguish
> between work for hire (maybe for several employers) and private submissions.

True.

We might want to allow projects to use different mode of operation if they
so desire, though.  Linus Torvalds at OSDL and Linus Torvalds at L-F may
be one same person, and the person who is summarizing may want to
coallesce his commmits like this, even under "-e" option:

    Linus Torvalds <torvalds@evo.osdl.org>,<torvalds@g5.osdl.org>,<torvalds@linux-foundation.org> (1093):
      Initial revision of "git", the information manager from hell
      Add copyright notices.
      ... (many more commits) ...

while there may be more than one John Smiths that we can differenciate only
by email and they get their own separate group as different people (each
of them may have more than one email addresses).

If a grouping of set of name-mail pairs per individual is kept somewhere,
that can be used to enhance shortlog to support such a use case [*1*].
And the UUID thing could be one possible implementation (you make
name-mail pair to first map to some third identifier, and treat name-mail
pairs that map to the same identifier as "one person").  But I don't think
it would work well if you forced the maintenance burden of such a mapping
to individuals.


[Footnote]

*1* unless there is a situation where one person (say "Junio C Hamano")
stopped using one e-mail address (say "junkio@cox.net") s/he has been
using, and then a different person with the same name came and started
using the same address, that is.

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Alex Bennee]

On 20 March 2010 18:10, Nicolas Pitre <nico@fluxnic.net> wrote:
> On Sat, 20 Mar 2010, Junio C Hamano wrote:
>
>> Michael J Gruber <git@drmicha.warpmail.net> writes:
>>
>> > With the current .mailmap, git shortlog shows the following for these:
>> Thanks for doing the gruntwork; very much appreciated.
>>
>> I'll backburner this and wait until the people who are described by these
>> entries say they want these entries in the .mailmap file.

I'm happy to have my name properly matched. I'm trying to keep my
repos where I do changes consistently configured with commit name and
email address but so far haven't managed it :-)

-- 
Alex, homepage: http://www.bennee.com/~alex/
http://www.half-llama.co.uk

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Sverre Rabbelier]

Heya,

[+those who are affected by this]

On Fri, Mar 19, 2010 at 12:02, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> With the current .mailmap, git shortlog shows the following for these:
>
>    11  Deskin Miller
>     3  Vitaly \"_Vi\" Shukela
>     1  Alex Bennee
>     1  Alex Bennée
>     1  Deskin Miler
>     1  Vitaly _Vi Shukela
>
> Add (e-mail based qualified) entries to .mailmap to get:
>
>    12  Deskin Miller
>     4  Vitaly "_Vi" Shukela
>     2  Alex Bennée
>
> The Shukela spelling is based on the version used consistently in the s-o-b
> lines of all his patches.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> Sparked by the recent discussion on uuid etc. I did a few (manual) checks.
> There seem to be 4 remaining "problematic" cases (Elrond, jidanni,
> Kirill, Twiinz) but 3 are unique, and I don't think we strictly require
> full names. Kirill may be one of several other Kirills.
>
> http://repo.or.cz/w/git/mjg.git/commit/cd13e44f33c1f6bc9ec11903c3041199c9c464ee
>
> (branch typo-fixes) in case of encoding problems
>
>  .mailmap |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 975e675..c507309 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -5,6 +5,7 @@
>  # same person appearing not to be so.
>  #
>
> +Alex Bennée <kernel-hacker@bennee.com>
>  Alexander Gavrilov <angavrilov@gmail.com>
>  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
>  Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
> @@ -15,6 +16,7 @@ Daniel Barkalow <barkalow@iabervon.org>
>  David D. Kilzer <ddkilzer@kilzer.net>
>  David Kågedal <davidk@lysator.liu.se>
>  David S. Miller <davem@davemloft.net>
> +Deskin Miller <deskinm@umich.edu>
>  Dirk Süsserott <newsletter@dirk.my1.cc>
>  Fredrik Kuivinen <freku045@student.liu.se>
>  H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
> @@ -59,6 +61,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
>  Uwe Kleine-König <uzeisberger@io.fsforth.de>
>  Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
>  Ville Skyttä <scop@xemacs.org>
> +Vitaly "_Vi" Shukela <public_vi@tut.by>
>  William Pursell <bill.pursell@gmail.com>
>  YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>  anonymous <linux@horizon.com>
> --
> 1.7.0.2.358.g30511

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Deskin Miller]

On Sat, Mar 20, 2010 at 17:47, Sverre Rabbelier <srabbelier@gmail.com> wrote:
> Heya,
>
> [+those who are affected by this]
>
> On Fri, Mar 19, 2010 at 12:02, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> With the current .mailmap, git shortlog shows the following for these:
>>
>>    11  Deskin Miller
>>     3  Vitaly \"_Vi\" Shukela
>>     1  Alex Bennee
>>     1  Alex Bennée
>>     1  Deskin Miler
>>     1  Vitaly _Vi Shukela
>>
>> Add (e-mail based qualified) entries to .mailmap to get:
>>
>>    12  Deskin Miller
>>     4  Vitaly "_Vi" Shukela
>>     2  Alex Bennée
>>
>> The Shukela spelling is based on the version used consistently in the s-o-b
>> lines of all his patches.
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>> Sparked by the recent discussion on uuid etc. I did a few (manual) checks.
>> There seem to be 4 remaining "problematic" cases (Elrond, jidanni,
>> Kirill, Twiinz) but 3 are unique, and I don't think we strictly require
>> full names. Kirill may be one of several other Kirills.
>>
>> http://repo.or.cz/w/git/mjg.git/commit/cd13e44f33c1f6bc9ec11903c3041199c9c464ee
>>
>> (branch typo-fixes) in case of encoding problems
>>
>>  .mailmap |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 975e675..c507309 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -5,6 +5,7 @@
>>  # same person appearing not to be so.
>>  #
>>
>> +Alex Bennée <kernel-hacker@bennee.com>
>>  Alexander Gavrilov <angavrilov@gmail.com>
>>  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
>>  Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
>> @@ -15,6 +16,7 @@ Daniel Barkalow <barkalow@iabervon.org>
>>  David D. Kilzer <ddkilzer@kilzer.net>
>>  David Kågedal <davidk@lysator.liu.se>
>>  David S. Miller <davem@davemloft.net>
>> +Deskin Miller <deskinm@umich.edu>
>>  Dirk Süsserott <newsletter@dirk.my1.cc>
>>  Fredrik Kuivinen <freku045@student.liu.se>
>>  H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
>> @@ -59,6 +61,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
>>  Uwe Kleine-König <uzeisberger@io.fsforth.de>
>>  Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
>>  Ville Skyttä <scop@xemacs.org>
>> +Vitaly "_Vi" Shukela <public_vi@tut.by>
>>  William Pursell <bill.pursell@gmail.com>
>>  YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>>  anonymous <linux@horizon.com>
>> --
>> 1.7.0.2.358.g30511
>

Looks good to me; FWIW I had been screwing around with filter-branch
on some commits I later submitted, and forgot to correct the
misspelling of my name.

Thanks,
Deskin Miller

Re: [PATCH] .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

[Jon Smirl]

On Fri, Mar 19, 2010 at 7:02 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> With the current .mailmap, git shortlog shows the following for these:
>
>    11  Deskin Miller
>     3  Vitaly \"_Vi\" Shukela
>     1  Alex Bennee
>     1  Alex Bennée
>     1  Deskin Miler
>     1  Vitaly _Vi Shukela

Which tool is introducing the charset errors?

Is there an easy way to add a check indicating a new name/email pair
and asking if it is correct?

-- 
Jon Smirl
jonsmirl@gmail.com