From: Jonathan Nieder <jrnieder@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: [PATCH 2/2] test: check that "git blame -e" uses mailmap correctly
Date: Tue, 14 Feb 2012 14:36:03 -0600 [thread overview]
Message-ID: <20120214203603.GD13210@burratino> (raw)
In-Reply-To: <20120214203431.GB13210@burratino>
From: Felipe Contreras <felipe.contreras@gmail.com>
Until f026358e ("mailmap: always return a plain mail address from
map_user()", 2012-02-05), git blame -e would add a spurious '>' after
the unchanged email address with brackets it passed to the mailmap
machinery, resulting in lines with a doubled '>' like this:
620456e6 (<committer@example.com>> 2005-04-07 15:20:13 -0700 8) eight
Add a test to make sure it doesn't happen again. This reuses the test
data for the existing "shortlog -e" test so it also tests other kinds
of mail mapping.
[jn: fixed some cut+paste cruft, added a patch description]
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
t/t4203-mailmap.sh | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 45526395..ef900d84 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -267,4 +267,20 @@ test_expect_success 'Blame output (complex mapping)' '
test_cmp expect actual.fuzz
'
+cat >expect <<\EOF
+^OBJI (<author@example.com> DATE 1) one
+OBJID (<some@dude.xx> DATE 2) two
+OBJID (<other@author.xx> DATE 3) three
+OBJID (<other@author.xx> DATE 4) four
+OBJID (<santa.claus@northpole.xx> DATE 5) five
+OBJID (<santa.claus@northpole.xx> DATE 6) six
+OBJID (<cto@company.xx> DATE 7) seven
+OBJID (<committer@example.com> DATE 8) eight
+EOF
+test_expect_success 'Blame -e output' '
+ git blame -e one >actual &&
+ fuzz_blame actual >actual.fuzz &&
+ test_cmp expect actual.fuzz
+'
+
test_done
--
1.7.9
next prev parent reply other threads:[~2012-02-14 20:36 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
2012-02-14 22:48 ` Felipe Contreras
2012-02-14 20:36 ` Jonathan Nieder [this message]
2012-02-14 21:41 ` [PATCH 2/2] test: check that "git blame -e" uses mailmap correctly 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=20120214203603.GD13210@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).