[PATCH 1/2] test: mailmap can change author name without changing email
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:53:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Felipe Contreras <redacted> A mailmap entry of the format 'A U Thor [off-list ref]' has two effects: (1) 'A U Thor' becomes the canonical author name for commits with author address 'email@example.com', and (2) 'email@example.com' 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 <redacted> Signed-off-by: Jonathan Nieder <redacted> --- 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@example.com> (1): CTO <cto@company.xx> (1): seventh +Committed <committer@example.com> (1): + eighth + Other Author <other@author.xx> (2): third fourth
@@ -196,6 +199,11 @@ test_expect_success 'Shortlog output (complex mapping)' ' test_tick && git commit --author "CTO <cto@coompany.xx>" -m seventh && + echo eight >>one && + git add one && + test_tick && + git commit --author "C O Mitter <committer@example.com>" -m eighth && + mkdir -p internal_mailmap && echo "Committed <committer@example.com>" > internal_mailmap/.mailmap && echo "<cto@company.xx> <cto@coompany.xx>" >> 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@example.com> maps to Committed <committer@example.com> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> + Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx> Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
@@ -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