git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH 1/2] test: mailmap can change author name without changing email
Date: Tue, 14 Feb 2012 15:50:23 -0600	[thread overview]
Message-ID: <20120214215023.GC9651@burratino> (raw)
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:

>> (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

  reply	other threads:[~2012-02-14 21:50 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-14 16:11 [PATCH 0/2] t: add blame -e tests for mailmap Felipe Contreras
2012-02-14 16:11 ` [PATCH 1/2] t: mailmap: add 'git blame -e' tests Felipe Contreras
2012-02-14 16:11 ` [PATCH 2/2] t: mailmap: add simple name translation test Felipe Contreras
2012-02-14 20:10   ` Junio C Hamano
2012-02-14 20:28     ` Felipe Contreras
2012-02-14 20:34 ` [PATCH v3 0/2] test: tests for the "double > from mailmap" bug Jonathan Nieder
2012-02-14 20:35   ` [PATCH 1/2] test: mailmap can change author name without changing email Jonathan Nieder
2012-02-14 21:35     ` Felipe Contreras
2012-02-14 21:50       ` Jonathan Nieder [this message]
2012-02-14 22:48         ` Felipe Contreras
2012-02-14 20:36   ` [PATCH 2/2] test: check that "git blame -e" uses mailmap correctly Jonathan Nieder
2012-02-14 21:41     ` Felipe Contreras
2012-02-14 21:59       ` Jonathan Nieder
2012-02-14 22:56         ` Felipe Contreras
2012-02-14 21:06   ` [PATCH v3 0/2] test: tests for the "double > from mailmap" bug Felipe Contreras
2012-02-14 21:15     ` Jonathan Nieder
2012-02-14 22:09       ` Felipe Contreras
2012-02-14 22:21         ` Jonathan Nieder
2012-02-14 22:36           ` Felipe Contreras
2012-02-14 21:14   ` Jeff King
2012-02-14 21:27     ` Jonathan Nieder
2012-02-14 21:52     ` Felipe Contreras
2012-02-14 22:07       ` Jeff King
2012-02-14 22:22         ` Felipe Contreras
2012-02-14 22:35           ` Jeff King
2012-02-14 22:18       ` Junio C Hamano
2012-02-14 22:34         ` Felipe Contreras
2012-02-14 22:49           ` Junio C Hamano
2012-02-14 23:14             ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120214215023.GC9651@burratino \
    --to=jrnieder@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).