From: Ariadne Conill <ariadne@dereferenced.org>
To: git@vger.kernel.org
Cc: Ariadne Conill <ariadne@dereferenced.org>
Subject: [PATCH v3 3/3] tests: rework mailmap tests for git log
Date: Thu, 11 Jul 2019 13:06:44 -0500 [thread overview]
Message-ID: <20190711180644.30417-4-ariadne@dereferenced.org> (raw)
In-Reply-To: <20190711180644.30417-1-ariadne@dereferenced.org>
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 <ariadne@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 <some@dude.xx>
Author: A U Thor <author@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 <some@dude.xx>
Author: A U Thor <author@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 <cto@coompany.xx>
+Author: claus <me@company.xx>
+Author: santa <me@company.xx>
+Author: nick2 <nick2@company.xx>
+Author: nick2 <bugs@company.xx>
+Author: nick1 <bugs@company.xx>
+Author: A U Thor <author@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.claus@northpole.xx>
Author: Santa Claus <santa.claus@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.claus@northpole.xx>
Author: Santa Claus <santa.claus@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 "<cto@coompany.xx>" >actual &&
+test_expect_success 'Grep author with log.mailmap disabled' '
+ git -c log.mailmap=False log --author "<santa.claus@northpole.xx>" >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'Grep author with --no-use-mailmap' '
+ git log --no-use-mailmap --author "<santa.claus@northpole.xx>" >actual &&
test_must_be_empty actual
'
+test_expect_success 'Only grep replaced author with mailmap enabled' '
+ git log --author "<cto@coompany.xx>" >actual &&
+ test_must_be_empty actual
+'
+cat >expect <<\EOF
+Author: santa <me@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
prev parent reply other threads:[~2019-07-11 18:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 18:06 [PATCH v3 0/3] use mailmap by default in git log Ariadne Conill
2019-07-11 18:06 ` [PATCH v3 1/3] log: use mailmap by default Ariadne Conill
2019-07-11 18:06 ` [PATCH v3 2/3] log: add --no-use-mailmap option to complement --use-mailmap option Ariadne Conill
2019-07-11 18:06 ` Ariadne Conill [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190711180644.30417-4-ariadne@dereferenced.org \
--to=ariadne@dereferenced.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.