From: Antoine Pelisse <>

The new option '--use-mailmap' can be used to make sure that mailmap
file is used to convert name when running log commands.

The test is simple and checks that the Author line
is correctly replaced when running log.

Signed-off-by: Antoine Pelisse <>
Signed-off-by: Junio C Hamano <>
 t/ | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/t/ b/t/
index 1f182f6..db043dc 100755
--- a/t/
+++ b/t/
@@ -239,6 +239,20 @@ test_expect_success 'Log output (complex mapping)' '
        test_cmp expect actual
+cat >expect <<\EOF
+Author: CTO <c...@company.xx>
+Author: Santa Claus <>
+Author: Santa Claus <>
+Author: Other Author <ot...@author.xx>
+Author: Other Author <ot...@author.xx>
+Author: Some Dude <s...@dude.xx>
+Author: A U Thor <>
+test_expect_success 'Log output with --use-mailmap' '
+       git log --use-mailmap | grep Author >actual &&
+       test_cmp expect actual
 # git blame
 cat >expect <<\EOF
 ^OBJI (A U Thor     DATE 1) one

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to