From: Stefan Beller <stefanbeller@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Bug in .mailmap handling?
Date: Fri, 12 Jul 2013 22:35:36 +0200 [thread overview]
Message-ID: <51E06898.3070303@googlemail.com> (raw)
In-Reply-To: <7vfvvjjzee.fsf@alter.siamese.dyndns.org>
On 07/12/2013 10:28 PM, Junio C Hamano wrote:
> Stefan Beller <stefanbeller@googlemail.com> writes:
>
>> # Adding the line to the mailmap should make life easy, so we know
>> # it's the same person
>> echo "A <A@example.org> <changed_email@example.org>" > .mailmap
>
> While I was looking at this, I noticed this piece of code:
>
> diff --git a/mailmap.c b/mailmap.c
> index 2a7b366..418081e 100644
> --- a/mailmap.c
> +++ b/mailmap.c
> @@ -122,7 +122,7 @@ static char *parse_name_and_email(char *buffer, char **name,
> while (nend > nstart && isspace(*nend))
> --nend;
>
> - *name = (nstart < nend ? nstart : NULL);
> + *name = (nstart <= nend ? nstart : NULL);
> *email = left+1;
> *(nend+1) = '\0';
> *right++ = '\0';
>
> The function is given a buffer "A <A@example.org>...", nstart scans
> from the beginning of the buffer, skipping whitespaces (there isn't
> any, so nstart points at the buffer), while nend starts from one
> byte before the first '<' and skips whitespaces backwards and ends
> at the first non-whitespace (i.e. it hits "A" at the beginning of
> the buffer). nstart == nend in this case for a single-letter name,
> and an off-by-one error makes it fail to pick up the name, which
> makes the entry equivalent to
>
> <A@example.org> <changed_email@example.org>
>
> without the name. I do not think this bug affected anything you
> observed, though.
>
>> git shortlog -sne
>> 1 A <A@example.org>
>> 1 A <a@example.org>
>
> This is coming from mailmap.c::add_mapping() that downcases the
> e-mail address.
>
> changed_email@example.org is mapped to a@example.org because of this
> downcasing, while "A <A@example.org>" does not have any entry for it
> in the .mailmap file, so it is given back as-is. Hence we see two
> distinct entries.
>
So do I understand it right, we're having 2 bugs in here?
One being triggered by the short name, only one character.
So if you want to debug the other bug with a longer name,
you can either use a made up name, or run
git shortlog -sne |grep Knut
in the git repository having the mailmap file already updated.
The way the mailmap file is written, I'd assume only one line
to be found, as of now 2 lines come up
2 Knut Franke <knut.franke@gmx.de>
1 Knut Franke <Knut.Franke@gmx.de>
which seems to downcase the whole first email.
next prev parent reply other threads:[~2013-07-12 20:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-12 16:07 Bug in .mailmap handling? Stefan Beller
2013-07-12 17:35 ` Junio C Hamano
2013-07-12 17:47 ` Stefan Beller
2013-07-12 20:28 ` Junio C Hamano
2013-07-12 20:35 ` Stefan Beller [this message]
2013-07-12 20:38 ` Junio C Hamano
2013-07-12 20:50 ` Junio C Hamano
2013-07-12 21:13 ` [PATCH] Add a testcase for checking case insensitivity of mail map Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51E06898.3070303@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).