[PATCH 4/4] add a testcase for checking case insensitivity of mailmap
From: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Junio C Hamano gits...@pobox.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-941-gda9c3c8 -- 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
Re: [PATCH 4/4] add a testcase for checking case insensitivity of mailmap
On Fri, Jul 12, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote: From: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Junio C Hamano gits...@pobox.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 +' This test was copied from earlier in the file, but the description was not updated; it has nothing to do with mailmap.blob tests for which cleanup has already taken place. It's also misleading since no .mailmap file exists at this point. Instead, configuration key mailmap.file is set to internal_mailmap/.mailmap, so if you need to clean up anything, it would be that. (You're also recreating .mailmap from scratch directly in your test via echo foo .mailmap, so this test doesn't really add anything.) +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' ' s/Names/names/ Also, most of the test descriptions in this script start with lowercase, so s/Test/test/ would be appropriate. + # do a commit: + echo asdf test1 Git practice normally avoids whitespace after the redirection operator. This particular test script, has a mix of foo and foo, but we may want to avoid adding more of the latter form. + 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) Without context of the mailing list discussion, the reader does not know what trick is or precisely how this may have failed in the past. It's also not clear why the test is being performed with a different email address entirely rather than one which differs only by case (which is what the test description talks about). + echo asdf test2 Whitespace after redirection. + 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 The comment can probably be dropped, as the new .mailmap entry is self-explanatory. + echo A a...@example.org changed_em...@example.org .mailmap Whitespace after redirection. + + git shortlog -sne HEAD actual test_cmp expect actual For consistency with more other tests, perhaps break the line apart: git shortlog -sne HEAD actual test_cmp expect actual +' + test_done -- 1.8.3.2-941-gda9c3c8 -- 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
Re: [PATCH 4/4] add a testcase for checking case insensitivity of mailmap
On Fri, Jul 12, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote: From: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Stefan Beller stefanbel...@googlemail.com Signed-off-by: Junio C Hamano gits...@pobox.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 +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 +' I forgot to mention that the -chain is broken (missing) in the entire test (except for the last line). -- 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
