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 <stefanbeller@xxxxxxxxxxxxxx> --- 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@xxxxxxxxxxx> + 2 Other Author <other@xxxxxxxxx> + 2 Santa Claus <santa.claus@xxxxxxxxxxxx> + 1 A U Thor <author@xxxxxxxxxxx> + 1 CTO <cto@xxxxxxxxxx> + 1 Some Dude <some@xxxxxxx> +EOF + +test_expect_success 'Test case sensitivity of Names' ' + # do a commit: + echo "asdf" > test1 + git add test1 + git commit -a --author="A <A@xxxxxxxxxxx>" -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_email@xxxxxxxxxxx>" -m "add test2" + + # Adding the line to the mailmap should make life easy, so we know + # it is the same person + echo "A <A@xxxxxxxxxxx> <changed_email@xxxxxxxxxxx>" > .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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html