In order to prove that the --no-use-mailmap option works as expected,
we add a test for it which runs with -c log.mailmap=true to ensure that
the option successfully negates the configured default.
Additionally, since --use-mailmap is now the default behaviour, we
remove mentions of --use-mailmap from the tests, since they are
redundant. We also rework some tests to explicitly define the
log.mailmap variable in both true and false states.
Signed-off-by: Ariadne Conill <aria...@dereferenced.org>
---
t/t4203-mailmap.sh | 49 ++++++++++++++++++++++++++++++++++++++--------
1 file changed, 41 insertions(+), 8 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 43b1522ea2..3d6086ff96 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -422,8 +422,8 @@ Author: Some Dude <s...@dude.xx>
Author: A U Thor <aut...@example.com>
EOF
-test_expect_success 'Log output with --use-mailmap' '
- git log --use-mailmap | grep Author >actual &&
+test_expect_success 'Log output with mailmap enabled (default)' '
+ git log | grep Author >actual &&
test_cmp expect actual
'
@@ -437,18 +437,33 @@ Author: Some Dude <s...@dude.xx>
Author: A U Thor <aut...@example.com>
EOF
-test_expect_success 'Log output with log.mailmap' '
+test_expect_success 'Log output with log.mailmap enabled in config' '
git -c log.mailmap=True log | grep Author >actual &&
test_cmp expect actual
'
+cat >expect <<\EOF
+Author: CTO <c...@coompany.xx>
+Author: claus <m...@company.xx>
+Author: santa <m...@company.xx>
+Author: nick2 <ni...@company.xx>
+Author: nick2 <b...@company.xx>
+Author: nick1 <b...@company.xx>
+Author: A U Thor <aut...@example.com>
+EOF
+
+test_expect_success 'Log output with log.mailmap disabled in config' '
+ git -c log.mailmap=False log | grep Author >actual &&
+ test_cmp expect actual
+'
+
cat >expect <<\EOF
Author: Santa Claus <santa.cl...@northpole.xx>
Author: Santa Claus <santa.cl...@northpole.xx>
EOF
-test_expect_success 'Grep author with --use-mailmap' '
- git log --use-mailmap --author Santa | grep Author >actual &&
+test_expect_success 'Grep author with mailmap enabled (default)' '
+ git log --author Santa | grep Author >actual &&
test_cmp expect actual
'
cat >expect <<\EOF
@@ -456,16 +471,34 @@ Author: Santa Claus <santa.cl...@northpole.xx>
Author: Santa Claus <santa.cl...@northpole.xx>
EOF
-test_expect_success 'Grep author with log.mailmap' '
+test_expect_success 'Grep author with log.mailmap enabled' '
git -c log.mailmap=True log --author Santa | grep Author >actual &&
test_cmp expect actual
'
-test_expect_success 'Only grep replaced author with --use-mailmap' '
- git log --use-mailmap --author "<c...@coompany.xx>" >actual &&
+test_expect_success 'Grep author with log.mailmap disabled' '
+ git -c log.mailmap=False log --author "<santa.cl...@northpole.xx>"
>actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'Grep author with --no-use-mailmap' '
+ git log --no-use-mailmap --author "<santa.cl...@northpole.xx>" >actual
&&
test_must_be_empty actual
'
+test_expect_success 'Only grep replaced author with mailmap enabled' '
+ git log --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
^OBJI (A U Thor DATE 1) one
--
2.17.1
