[PATCH] Add git special file .mailmap

[PATCH] Add git special file .mailmap

[Don Slutz]

This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
See 'git shortlog --help'

I need this because my e-mail address has changed.
I also added a few lines that I think are correct.

Signed-off-by: Don Slutz <dslutz@verizon.com>
---
 .mailmap |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d5ccf42
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,17 @@
+Don Slutz <dslutz@verizon.com> Don Slutz <Don@CloudSwitch.com>
+Keir Fraser <keir@xen.org> Keir Frser <keir@xen.org>
+Keir Fraser <keir@xen.org> Keir Fraser <keir@xensource.com>
+Keir Fraser <keir@xen.org> Keir Fraser <keir.fraser@citrix.com>
+Jan Beulich <jbeulich@suse.com> Jan Beulich <JBeulich@suse.com>
+Jan Beulich <jbeulich@suse.com> Jan Beulich <jbeulich@novell.com>
+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
+Tim Deegan <tim@xen.org> Tim Deegan <Tim.Deegan@xensource.com>
+Tim Deegan <tim@xen.org> Tim Deegan <Tim.Deegan@citrix.com>
+Tim Deegan <tim@xen.org> Tim Deegan <Tim.Deegan@eu.citrix.com>
+Tim Deegan <tim@xen.org> Tim Deegan <tim.deegan@xensource.com>
+Ian Campbell <ian.campbell@citrix.com> Ian Campbell <ian.campbell@xensource.com>
+Ian Campbell <ian.campbell@citrix.com> Ian.Campbell@xensource.com <Ian.Campbell@xensource.com>
+Ian Campbell <ian.campbell@citrix.com> Ian Campbell <Ian.Campbell@citrix.com>
+Ian Campbell <ian.campbell@citrix.com> Ian Campbell <ijc@hellion.org.uk>
+Ian Campbell <ian.campbell@citrix.com> Ian Campbell <Ian.Campbell@eu.citrix.com>
+Ian Jackson <ian.jackson@eu.citrix.com> Ian Jackson <Ian.Jackson@eu.citrix.com>
-- 
1.7.1

Re: [PATCH] Add git special file .mailmap

[Ian Campbell]

On Wed, 2013-10-02 at 17:32 -0400, Don Slutz wrote:
> This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
> See 'git shortlog --help'
> 
> I need this because my e-mail address has changed.

I'm not so sure about this. Linux uses this file only to correct bad
UTF-8 encoding or actual spelling errors and similar such things.

I think if you made a contribution while at verizon there's no reason
for it not to continue to appear so in the logs. Certainly we'd be
adding a tonne of admin overhead if we were to try and keep everyone's
address current, you've only scratched the surface here.

>+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>

This one seems like a good idea.

> +Ian Campbell <ian.campbell@citrix.com> Ian Campbell <ijc@hellion.org.uk>

Even apart from the above this one isn't necessarily correct, it would
(sometimes) signify something I did on my own time (e.g. for Debian
purposes) rather than at work.

Ian.

Re: [PATCH] Add git special file .mailmap

[Jan Beulich]

>>> On 03.10.13 at 09:18, Ian Campbell <Ian.Campbell@citrix.com> wrote:
> On Wed, 2013-10-02 at 17:32 -0400, Don Slutz wrote:
>>+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
> 
> This one seems like a good idea.

Albeit I wonder why it's needed in the first place...

Jan

Re: [PATCH] Add git special file .mailmap

[Ian Campbell]

On Fri, 2013-10-04 at 10:33 +0100, Jan Beulich wrote:
> >>> On 03.10.13 at 09:18, Ian Campbell <Ian.Campbell@citrix.com> wrote:
> > On Wed, 2013-10-02 at 17:32 -0400, Don Slutz wrote:
> >>+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
> > 
> > This one seems like a good idea.
> 
> Albeit I wonder why it's needed in the first place...

Things like this I guess:
        commit b314cd733413babc5978b819793ad5c77f094adf
        Author: Jan Beulich <none@none>
        Date:   Wed Sep 12 13:24:28 2012 +0200
        
            Revert 25843:51090fe1ab97 (x86/HVM: assorted RTC emulation adjustments)
            
            This was found to cause RHEL6 HVM guests to hang during shutdown.

I don't know if that's a git thing on whichever system was in use at the
time or maybe it was a mercurial conversion issue.

Ian.

Re: [PATCH] Add git special file .mailmap

[Don Slutz]

[-- Attachment #1.1: Type: text/plain, Size: 2313 bytes --]

On 10/03/13 03:18, Ian Campbell wrote:
> On Wed, 2013-10-02 at 17:32 -0400, Don Slutz wrote:
>> This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
>> See 'git shortlog --help'
>>
>> I need this because my e-mail address has changed.
> I'm not so sure about this. Linux uses this file only to correct bad
> UTF-8 encoding or actual spelling errors and similar such things.
>
> I think if you made a contribution while at verizon there's no reason
> for it not to continue to appear so in the logs. Certainly we'd be
> adding a tonne of admin overhead if we were to try and keep everyone's
> address current, you've only scratched the surface here.
This file does not in general change the output of "git log".  It can be used to do so:

    don-760:~/xen>git show --pretty=format:"%h: committer=%cn <%ce> mapped to %cN <%cE>" 930b3fc8c9aafdc6723b3addc5a569dedffacc1d | head -1
    930b3fc: committer=Ian Campbell <ijc@hellion.org.uk> mapped to Ian Campbell <ian.campbell@citrix.com>

Also I was just trying to get a sample together.  I am fine with just a few lines.
>> +Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
> This one seems like a good idea.
>
>> +Ian Campbell <ian.campbell@citrix.com> Ian Campbell <ijc@hellion.org.uk>
> Even apart from the above this one isn't necessarily correct, it would
> (sometimes) signify something I did on my own time (e.g. for Debian
> purposes) rather than at work.
>
> Ian.
>
How about:

 From 23738ce00048bfd18703dfdcb04c88231e71a547 Mon Sep 17 00:00:00 2001
From: Don Slutz <dslutz@verizon.com>
Date: Wed, 2 Oct 2013 13:57:47 -0400
Subject: [PATCH] Add git special file .mailmap

This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
See 'git shortlog --help'

I need this because my e-mail address has changed.
I also added a few lines that I think are correct.

Signed-off-by: Don Slutz <dslutz@verizon.com>
---
  .mailmap |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
  create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..6d51b66
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Don Slutz <dslutz@verizon.com> Don Slutz <Don@CloudSwitch.com>
+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
-- 
1.7.1


[-- Attachment #1.2: Type: text/html, Size: 4240 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] Add git special file .mailmap

[Ian Campbell]

On Fri, 2013-10-04 at 14:39 -0400, Don Slutz wrote:

> I need this because my e-mail address has changed.

I continue to disagree with this. Whatever you did at CloudSwitch was
done at CloudSwitch. I'm sure people who need to mail you will figure
out a way to do so without needing to refer to a random changeset.

The fact that we don't have an existing file and that noone else has
seen a need to do this when they change jobs should give a pretty big
hint that it is neither normal nor necessary.

> I also added a few lines that I think are correct.
> 
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> ---
>  .mailmap |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>  create mode 100644 .mailmap
> 
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index 0000000..6d51b66
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,2 @@
> +Don Slutz <dslutz@verizon.com> Don Slutz <Don@CloudSwitch.com>
> +Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
> -- 
> 1.7.1
> 

Re: [PATCH] Add git special file .mailmap

[Don Slutz]

Based on a lack of other replies, and as far as I can tell Ian Campbell does not want this, I am happy to withdraw this patch request.
    -Don Slutz

On 10/07/13 04:56, Ian Campbell wrote:
> On Fri, 2013-10-04 at 14:39 -0400, Don Slutz wrote:
>
>> I need this because my e-mail address has changed.
> I continue to disagree with this. Whatever you did at CloudSwitch was
> done at CloudSwitch. I'm sure people who need to mail you will figure
> out a way to do so without needing to refer to a random changeset.
>
> The fact that we don't have an existing file and that noone else has
> seen a need to do this when they change jobs should give a pretty big
> hint that it is neither normal nor necessary.
>
>> I also added a few lines that I think are correct.
>>
>> Signed-off-by: Don Slutz <dslutz@verizon.com>
>> ---
>>   .mailmap |    2 ++
>>   1 files changed, 2 insertions(+), 0 deletions(-)
>>   create mode 100644 .mailmap
>>
>> diff --git a/.mailmap b/.mailmap
>> new file mode 100644
>> index 0000000..6d51b66
>> --- /dev/null
>> +++ b/.mailmap
>> @@ -0,0 +1,2 @@
>> +Don Slutz <dslutz@verizon.com> Don Slutz <Don@CloudSwitch.com>
>> +Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
>> -- 
>> 1.7.1
>>
>