From: Felipe Contreras <felipe.contreras@xxxxxxxxx>
A mailmap entry of the format 'A U Thor <email@xxxxxxxxxxx>' has two
effects: (1) 'A U Thor' becomes the canonical author name for commits
with author address 'email@xxxxxxxxxxx', and (2) 'email@xxxxxxxxxxx'
becomes the canonical author email for commits with author name 'A U
Thor'.
We already have tests for the effect (1) in 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.
[jn: simplified by reusing Committer mailmap entry, clarified
description]
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
t/t4203-mailmap.sh | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 1f182f61..45526395 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -157,6 +157,9 @@ A U Thor <author@xxxxxxxxxxx> (1):
CTO <cto@xxxxxxxxxx> (1):
seventh
+Committed <committer@xxxxxxxxxxx> (1):
+ eighth
+
Other Author <other@xxxxxxxxx> (2):
third
fourth
@@ -196,6 +199,11 @@ test_expect_success 'Shortlog output (complex mapping)' '
test_tick &&
git commit --author "CTO <cto@xxxxxxxxxxx>" -m seventh &&
+ echo eight >>one &&
+ git add one &&
+ test_tick &&
+ git commit --author "C O Mitter <committer@xxxxxxxxxxx>" -m eighth &&
+
mkdir -p internal_mailmap &&
echo "Committed <committer@xxxxxxxxxxx>" > internal_mailmap/.mailmap &&
echo "<cto@xxxxxxxxxx> <cto@xxxxxxxxxxx>" >> internal_mailmap/.mailmap &&
@@ -212,6 +220,9 @@ test_expect_success 'Shortlog output (complex mapping)' '
# git log with --pretty format which uses the name and email mailmap placemarkers
cat >expect <<\EOF
+Author C O Mitter <committer@xxxxxxxxxxx> maps to Committed <committer@xxxxxxxxxxx>
+Committer C O Mitter <committer@xxxxxxxxxxx> maps to Committed <committer@xxxxxxxxxxx>
+
Author CTO <cto@xxxxxxxxxxx> maps to CTO <cto@xxxxxxxxxx>
Committer C O Mitter <committer@xxxxxxxxxxx> maps to Committed <committer@xxxxxxxxxxx>
@@ -248,6 +259,7 @@ OBJID (Other Author DATE 4) four
OBJID (Santa Claus DATE 5) five
OBJID (Santa Claus DATE 6) six
OBJID (CTO DATE 7) seven
+OBJID (Committed DATE 8) eight
EOF
test_expect_success 'Blame output (complex mapping)' '
git blame one >actual &&
--
1.7.9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html