From: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org
Subject: Bug in .mailmap handling?
Date: Fri, 12 Jul 2013 18:07:21 +0200 [thread overview]
Message-ID: <51E029B9.20108@googlemail.com> (raw)
Hello,
you may have noticed I am currently trying to bring the
mailmap file of git itself up to date. I noticed
some behavior, which I did not expect. Have a look yourself:
---
# prepare test environment:
mkdir testmailmap
cd testmailmap/
git init
# do a commit:
echo "asdf" > test1
git add test1
git commit -a --author="A <A@example.org>" -m "add test1"
# commit with same name, but different email
# (different capitalization does the trick already,
# but here I am going to use a different mail)
echo "asdf" > test2
git add test2
git commit -a --author="A <changed_email@example.org>" -m "add test2"
# how do we know it's the same person?
git shortlog
A (2):
add test1
add test2
# reports as expected:
git shortlog -sne
1 A <A@example.org>
1 A <changed_email@example.org>
# 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
# Come on, I just wanted to have it reported as one person!
git shortlog -sne
1 A <A@example.org>
1 A <a@example.org>
# So let's try another line in the mailmap file, (small 'a')
echo "A <a@example.org> <changed_email@example.org>" > .mailmap
# We're not there yet?
git shortlog -sne
1 A <A@example.org>
1 A <a@example.org>
# Now let's write it rather explicit:
# (essentially just write 2 lines into the mailmap file)
cat << EOF > .mailmap
A <a@example.org> <changed_email@example.org>
A <a@example.org> <A@example.org>
EOF
# works as expected now
git shortlog -sne
2 A <a@example.org>
# works as expected now as well
git shortlog
A (2):
add test1
add test2
next reply other threads:[~2013-07-12 16:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-12 16:07 Stefan Beller [this message]
2013-07-12 17:35 ` Bug in .mailmap handling? 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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51E029B9.20108@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.