summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/gitmailmap.txt5
-rwxr-xr-xt/t4203-mailmap.sh14
2 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt
index 55dfebd..7f10897 100644
--- a/Documentation/gitmailmap.txt
+++ b/Documentation/gitmailmap.txt
@@ -49,6 +49,11 @@ commit matching the specified commit email address, and:
which allows mailmap to replace both the name and the email of a
commit matching both the specified commit name and email address.
+Both E-Mails and names are matched case-insensitively. For example
+this would also match the 'Commit Name <commit@email.xx>' above:
+--
+Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
+--
EXAMPLES
--------
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index f19736f..89cb300 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -220,7 +220,21 @@ test_expect_success 'name entry after email entry, case-insensitive' '
initial
EOF
+ git shortlog HEAD >actual &&
+ test_cmp expect actual &&
+
+ cat >internal.map <<-\EOF &&
+ NiCk <BuGs@CoMpAnY.Xy> NICK1 <BUGS@COMPANY.XX>
+ EOF
+
+ cat >expect <<-\EOF &&
+ NiCk (1):
+ second
+
+ Repo Guy (1):
+ initial
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'