diff mbox

[RFC] Add a .mailmap to map pre-git-conversion authors to friendly names

Message ID 1319650592-14292-1-git-send-email-peter.maydell@linaro.org
State Superseded
Headers show

Commit Message

Peter Maydell Oct. 26, 2011, 5:36 p.m. UTC
Add a .mailmap file so 'git shortlog' can map the unfriendly
pre-git-conversion author entries to real names.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
I've had this kicking around in my working tree for a while, but it seems
like it's more generally useful. Opinions?

 .mailmap |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 .mailmap

Comments

Peter Maydell Nov. 17, 2011, 6:10 p.m. UTC | #1
...nobody cares at all either way? (in which case we should commit
it for my personal benefit if nothing else ;-))

-- PMM

On 26 October 2011 18:36, Peter Maydell <peter.maydell@linaro.org> wrote:
> Add a .mailmap file so 'git shortlog' can map the unfriendly
> pre-git-conversion author entries to real names.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> I've had this kicking around in my working tree for a while, but it seems
> like it's more generally useful. Opinions?
>
>  .mailmap |   20 ++++++++++++++++++++
>  1 files changed, 20 insertions(+), 0 deletions(-)
>  create mode 100644 .mailmap
>
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index 0000000..6f968d8
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,20 @@
> +# This mailmap just translates the weird addresses from the original import into git
> +# into proper addresses so that they are counted properly in git shortlog output.
> +#
> +Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
> +malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Andrzej Zaborowski <balrog@zabor.org> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
> +Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
> +#
> +# Weird addresses with no translation because they have made no commits since the
> +# switchover to git:
> +#    bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
> +#    j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
> +#
> +# There is also a:
> +#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
> +# for the cvs2svn initialization commit e63c3dc74bf.
> --
> 1.7.1
Anthony Liguori Nov. 17, 2011, 7:15 p.m. UTC | #2
On 11/17/2011 12:10 PM, Peter Maydell wrote:
> ...nobody cares at all either way? (in which case we should commit
> it for my personal benefit if nothing else ;-))

Oh, I just missed it since it didn't have [PATCH] in the header.  I'd be happy 
to apply this.

Regards,

Anthony Liguori

>
> -- PMM
>
> On 26 October 2011 18:36, Peter Maydell<peter.maydell@linaro.org>  wrote:
>> Add a .mailmap file so 'git shortlog' can map the unfriendly
>> pre-git-conversion author entries to real names.
>>
>> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
>> ---
>> I've had this kicking around in my working tree for a while, but it seems
>> like it's more generally useful. Opinions?
>>
>>   .mailmap |   20 ++++++++++++++++++++
>>   1 files changed, 20 insertions(+), 0 deletions(-)
>>   create mode 100644 .mailmap
>>
>> diff --git a/.mailmap b/.mailmap
>> new file mode 100644
>> index 0000000..6f968d8
>> --- /dev/null
>> +++ b/.mailmap
>> @@ -0,0 +1,20 @@
>> +# This mailmap just translates the weird addresses from the original import into git
>> +# into proper addresses so that they are counted properly in git shortlog output.
>> +#
>> +Aurelien Jarno<aurelien@aurel32.net>  aurel32<aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Blue Swirl<blauwirbel@gmail.com>  blueswir1<blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Anthony Liguori<aliguori@us.ibm.com>  aliguori<aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Edgar E. Iglesias<edgar.iglesias@gmail.com>  edgar_igl<edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +malc<av1474@comtv.ru>  malc<malc@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Paul Brook<paul@codesourcery.com>  pbrook<pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Andrzej Zaborowski<balrog@zabor.org>  balrog<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Thiemo Seufer<ths@networkno.de>  ths<ths@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +#
>> +# Weird addresses with no translation because they have made no commits since the
>> +# switchover to git:
>> +#    bellard<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +#    j_mayer<j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +#
>> +# There is also a:
>> +#    (no author)<(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +# for the cvs2svn initialization commit e63c3dc74bf.
>> --
>> 1.7.1
>
Andreas Färber Nov. 18, 2011, 1:30 p.m. UTC | #3
Am 17.11.2011 19:10, schrieb Peter Maydell:
> ...nobody cares at all either way? (in which case we should commit
> it for my personal benefit if nothing else ;-))

Had a brief look at it, but didn't check the SVN "email addresses".
I like the idea in general.

> On 26 October 2011 18:36, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Add a .mailmap file so 'git shortlog' can map the unfriendly
>> pre-git-conversion author entries to real names.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---

>> diff --git a/.mailmap b/.mailmap
>> new file mode 100644
>> index 0000000..6f968d8
>> --- /dev/null
>> +++ b/.mailmap
>> @@ -0,0 +1,20 @@
>> +# This mailmap just translates the weird addresses from the original import into git
>> +# into proper addresses so that they are counted properly in git shortlog output.
>> +#
>> +Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +Andrzej Zaborowski <balrog@zabor.org> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>

You should probably at least cc (if not get acks from) all the persons
listed above.
Anthony is using two; Andrzej four and a different one lately.

>> +Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +#
>> +# Weird addresses with no translation because they have made no commits since the
>> +# switchover to git:
>> +#    bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>

Fabrice Bellard <fabrice@bellard.org> (cf. bellard.org)

>> +#    j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>

Jocelyn Mayer <l_indien@magic.fr> (cf. OpenHack'Ware sources)

>> +#
>> +# There is also a:
>> +#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
>> +# for the cvs2svn initialization commit e63c3dc74bf.

Andreas
Peter Maydell Nov. 18, 2011, 2 p.m. UTC | #4
On 18 November 2011 13:30, Andreas Färber <afaerber@suse.de> wrote:
> Am 17.11.2011 19:10, schrieb Peter Maydell:
>>> +Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +Andrzej Zaborowski <balrog@zabor.org> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
>
> You should probably at least cc (if not get acks from) all the persons
> listed above.

Really?

> Anthony is using two; Andrzej four and a different one lately.

(these email addresses are the ones listed in MAINTAINERS for everybody except
Andrzej, where I think I just mispicked.)

>>> +Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
>>> +#
>>> +# Weird addresses with no translation because they have made no commits since the
>>> +# switchover to git:
>>> +#    bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
>
> Fabrice Bellard <fabrice@bellard.org> (cf. bellard.org)
>
>>> +#    j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
>
> Jocelyn Mayer <l_indien@magic.fr> (cf. OpenHack'Ware sources)

I wasn't entirely sure about adding an email address to a project file
where it wasn't already present in our codebase/git. I can add these, though.

-- PMM
diff mbox

Patch

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..6f968d8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,20 @@ 
+# This mailmap just translates the weird addresses from the original import into git
+# into proper addresses so that they are counted properly in git shortlog output.
+#
+Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
+Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
+Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
+Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
+malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
+Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
+Andrzej Zaborowski <balrog@zabor.org> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
+Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
+#
+# Weird addresses with no translation because they have made no commits since the
+# switchover to git:
+#    bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
+#    j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
+#
+# There is also a:
+#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
+# for the cvs2svn initialization commit e63c3dc74bf.