Re: [PATCH 1/2] test: mailmap can change author name without changing email

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 14, 2012, 21:50 UTC
Message-ID: <20120214215023.GC9651@burratino>
In-Reply-To: <CAMP44s3di25SbMa1T1=0_s6f-rKnniwEcA+o5HWT7xedcghSeg@mail.gmail.com>

Felipe Contreras wrote:

> On Tue, Feb 14, 2012 at 10:35 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 7 quoted lines

>> (2) 'email@example.com'
>> becomes the canonical author email for commits with author name 'A U
>> Thor'.
>
> That's not true. I initially thought that was the case, and I think it
> might be useful to have that, but it's not the case now, and your
> patch doesn't test this.

Thanks for explaining. I had indeed confused myself into thinking 'A U Thor <email@example.com>' would act like 'A U Thor <email@example.com> <email@example.com>'.

I should have said:

-- 8< -- A mailmap entry in the format 'A U Thor <email@example.com>' means that 'A U Thor' should be the canonical author name for commits with author address 'email@example.com', and the email address should be left alone.

We already have tests for this format regarding the committer name, but not in the author name, so the tests do not cover the shortlog and blame codepaths as they should. Fix that. -- >8 --

[...]

>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>
> I most definitely did not sign this off, and I didn't add any of these
> lines, nor wrote anything about this commit message.

That's why I described the changes I made, signed with my initials, and put my own sign-off below yours. Did I screw up somewhere?

Note that I am making these changes because, at its heart, I think your patch is good and useful. Otherwise I would have ignored it and worked on something else. If you prefer that I don't make improvements like this, please indicate why that's a good idea; otherwise I will probably continue to do it when I see good patches, despite all the signals you are giving that I have done something awful by corrupting your perfect patch in this way.

Jonathan