Your patch seems to do it.
I added a test case which doesn't fail, if your patch is added.

Signed-off-by: Stefan Beller <stefanbel...@googlemail.com>

---
 t/t4203-mailmap.sh | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 842b754..07152e9 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -409,4 +409,37 @@ test_expect_success 'Blame output (complex mapping)' '
        test_cmp expect actual.fuzz
 '
 
+test_expect_success 'cleanup after mailmap.blob tests' '
+       rm -f .mailmap
+'
+
+cat >expect <<\EOF
+     2 A <a...@example.org>
+     2 Other Author <ot...@author.xx>
+     2 Santa Claus <santa.cl...@northpole.xx>
+     1 A U Thor <aut...@example.com>
+     1 CTO <c...@company.xx>
+     1 Some Dude <s...@dude.xx>
+EOF
+
+test_expect_success 'Test case sensitivity of Names' '
+       # do a commit:
+       echo "asdf" > test1
+       git add test1
+       git commit -a --author="A <a...@example.org>" -m "add test1"
+
+       # commit with same name, but different email
+       # (different capitalization does the trick already,
+       # but here I am going to use a different mail)
+       echo "asdf" > test2
+       git add test2
+       git commit -a --author="A <changed_em...@example.org>" -m "add test2"
+
+       # Adding the line to the mailmap should make life easy, so we know
+       # it is the same person
+       echo "A <a...@example.org> <changed_em...@example.org>" > .mailmap
+
+       git shortlog -sne HEAD >actual && test_cmp expect actual
+'
+
 test_done
-- 
1.8.3.2.776.gfcf213d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to