git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Antoine Pelisse <apelisse@gmail.com>
To: git@vger.kernel.org
Cc: Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH v2 7/7] test: Add test for --use-mailmap option
Date: Sat, 15 Dec 2012 19:05:54 +0100	[thread overview]
Message-ID: <1355594754-27589-8-git-send-email-apelisse@gmail.com> (raw)
In-Reply-To: <1355594754-27589-1-git-send-email-apelisse@gmail.com>

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 <apelisse@gmail.com>
---
 t/t4203-mailmap.sh |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 1f182f6..db043dc 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -239,6 +239,20 @@ test_expect_success 'Log output (complex mapping)' '
 	test_cmp expect actual
 '
 
+cat >expect <<\EOF
+Author: CTO <cto@company.xx>
+Author: Santa Claus <santa.claus@northpole.xx>
+Author: Santa Claus <santa.claus@northpole.xx>
+Author: Other Author <other@author.xx>
+Author: Other Author <other@author.xx>
+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_cmp expect actual
+'
+
 # git blame
 cat >expect <<\EOF
 ^OBJI (A U Thor     DATE 1) one
-- 
1.7.9.5

  parent reply	other threads:[~2012-12-15 18:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-15 18:05 [PATCH v2 0/7] Allow git log to use mailmap file Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 1/7] Use split_ident_line to parse author and committer Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 2/7] mailmap: Remove buffer length limit in map_user Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 3/7] mailmap: Simplify map_user() interface Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 4/7] mailmap: Add mailmap structure to rev_info and pp Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 5/7] pretty: Use mailmap to display username and email Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 6/7] log: Add --use-mailmap option Antoine Pelisse
2012-12-15 18:05 ` Antoine Pelisse [this message]
2012-12-15 20:18 ` [PATCH v2 0/7] Allow git log to use mailmap file Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355594754-27589-8-git-send-email-apelisse@gmail.com \
    --to=apelisse@gmail.com \
    --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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).