{"thread":{"id":"29629","subject":"[PATCH v3 0/2] t: add blame -e tests for mailmap","startedAt":"2012-02-14T23:32:26Z","lastAt":"2012-02-14T23:32:28Z","messageCount":3,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":3,"patchTotal":2},"messages":[{"id":"184732","messageId":"1329262348-9546-1-git-send-email-felipe.contreras@gmail.com","threadId":"29629","inReplyTo":null,"subject":"[PATCH v3 0/2] t: add blame -e tests for mailmap","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-02-14T23:32:26Z","receivedAt":"2012-02-14T23:32:26Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"I sent both the fix and the tests. Another fix was applied, but we are still\nmissing the tests.\n\nThese are good before, and after the fix.\n\nSince v2 (which I forgot to prefix):\n\n 1) Be _a bit_ more explicit about the fact that the new tests where missing.\n Also state in the output that these are for blame show-email.\n 2) Explain why the existing tests are not enough, and what fixed one of them\n\nFelipe Contreras (2):\n t: mailmap: add missing 'git blame -e' tests\n t: mailmap: add simple name translation test\n\n t/t4203-mailmap.sh | 32 ++++++++++++++++++++++++++++++++\n 1 files changed, 32 insertions(+), 0 deletions(-)\n\n-- \n1.7.9\n"},{"id":"184733","messageId":"1329262348-9546-2-git-send-email-felipe.contreras@gmail.com","threadId":"29629","inReplyTo":"1329262348-9546-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 1/2] t: mailmap: add missing 'git blame -e' tests","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-02-14T23:32:27Z","receivedAt":"2012-02-14T23:32:27Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n t/t4203-mailmap.sh | 18 ++++++++++++++++++\n 1 files changed, 18 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh\nindex 1f182f6..ec5d98c 100755\n--- a/t/t4203-mailmap.sh\n+++ b/t/t4203-mailmap.sh\n@@ -255,4 +255,22 @@ test_expect_success 'Blame output (complex mapping)' '\n \ttest_cmp expect actual.fuzz\n '\n \n+# git blame -e\n+cat >expect <<\\EOF\n+^OBJI ( DATE 1) one\n+OBJID ( DATE 2) two\n+OBJID ( DATE 3) three\n+OBJID ( DATE 4) four\n+OBJID ( DATE 5) five\n+OBJID ( DATE 6) six\n+OBJID ( DATE 7) seven\n+EOF\n+test_expect_success 'Blame show email output (complex mapping)' '\n+\tgit blame -e one >actual &&\n+\tcp actual /tmp &&\n+\tcp internal_mailmap/.mailmap /tmp &&\n+\tfuzz_blame actual >actual.fuzz &&\n+\ttest_cmp expect actual.fuzz\n+'\n+\n test_done\n-- \n1.7.9\n"},{"id":"184734","messageId":"1329262348-9546-3-git-send-email-felipe.contreras@gmail.com","threadId":"29629","inReplyTo":"1329262348-9546-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v3 2/2] t: mailmap: add simple name translation test","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-02-14T23:32:28Z","receivedAt":"2012-02-14T23:32:28Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"There's already tests for this, but they don't check the output of\n'git blame'.\n\nNote that the output of 'git blame -e' was fixed in commit f026358 [1],\nso the test would fail before that.\n\n[1] mailmap: always return a plain mail address from map_user()\n\nSigned-off-by: Felipe Contreras \n---\n t/t4203-mailmap.sh | 14 ++++++++++++++\n 1 files changed, 14 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh\nindex ec5d98c..d2bab98 100755\n--- a/t/t4203-mailmap.sh\n+++ b/t/t4203-mailmap.sh\n@@ -157,6 +157,9 @@ A U Thor (1):\n CTO (1):\n seventh\n \n+Mr. Right (1):\n+ eight\n+\n Other Author (2):\n third\n fourth\n@@ -196,6 +199,11 @@ test_expect_success 'Shortlog output (complex mapping)' '\n \ttest_tick &&\n \tgit commit --author \"CTO \" -m seventh &&\n \n+\techo eight >>one &&\n+\tgit add one &&\n+\ttest_tick &&\n+\tgit commit --author \"Wrong \" -m eight &&\n+\n \tmkdir -p internal_mailmap &&\n \techo \"Committed \" > internal_mailmap/.mailmap &&\n \techo \" \" >> internal_mailmap/.mailmap &&\n@@ -204,6 +212,7 @@ test_expect_success 'Shortlog output (complex mapping)' '\n \techo \"Other Author \" >> internal_mailmap/.mailmap &&\n \techo \"Santa Claus \" >> internal_mailmap/.mailmap &&\n \techo \"Santa Claus \" >> internal_mailmap/.mailmap &&\n+\techo \"Mr. Right \" >> internal_mailmap/.mailmap &&\n \n \tgit shortlog -e HEAD >actual &&\n \ttest_cmp expect actual\n@@ -212,6 +221,9 @@ test_expect_success 'Shortlog output (complex mapping)' '\n \n # git log with --pretty format which uses the name and email mailmap placemarkers\n cat >expect <<\\EOF\n+Author Wrong maps to Mr. Right \n+Committer C O Mitter maps to Committed \n+\n Author CTO maps to CTO \n Committer C O Mitter maps to Committed \n \n@@ -248,6 +260,7 @@ OBJID (Other Author DATE 4) four\n OBJID (Santa Claus DATE 5) five\n OBJID (Santa Claus DATE 6) six\n OBJID (CTO DATE 7) seven\n+OBJID (Mr. Right DATE 8) eight\n EOF\n test_expect_success 'Blame output (complex mapping)' '\n \tgit blame one >actual &&\n@@ -264,6 +277,7 @@ OBJID ( DATE 4) four\n OBJID ( DATE 5) five\n OBJID ( DATE 6) six\n OBJID ( DATE 7) seven\n+OBJID ( DATE 8) eight\n EOF\n test_expect_success 'Blame show email output (complex mapping)' '\n \tgit blame -e one >actual &&\n-- \n1.7.9\n"}]}