In order to prove that the --no-use-mailmap option works as expected,
we add a test for it which runs with -Dlog.mailmap=true to ensure that
the option successfully negates the configured default.

Signed-off-by: Ariadne Conill <aria...@dereferenced.org>
---
 t/t4203-mailmap.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 43b1522ea2..23a8947bce 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -465,6 +465,14 @@ test_expect_success 'Only grep replaced author with 
--use-mailmap' '
        git log --use-mailmap --author "<c...@coompany.xx>" >actual &&
        test_must_be_empty actual
 '
+cat >expect <<\EOF
+Author: santa <m...@company.xx>
+EOF
+
+test_expect_success 'Grep author with --no-use-mailmap + log.mailmap=True' '
+       git -c log.mailmap=True log --no-use-mailmap --author santa | grep 
Author >actual &&
+       test_cmp expect actual
+'
 
 # git blame
 cat >expect <<\EOF
-- 
2.17.1

Reply via email to