From 34986b773a0ebe0298965b64c801dd983cba29e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 12 Jan 2021 21:18:04 +0100 Subject: [PATCH] mailmap tests: add tests for empty "<>" syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add tests for mailmap's handling of "<>", which is allowed on the RHS, but not the LHS of a " " pair. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t4203-mailmap.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index 4f61655c04..f19736fef1 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -838,4 +838,31 @@ test_expect_success 'whitespace syntax: setup' ' test_cmp expect actual ' +test_expect_success 'empty syntax: setup' ' + test_create_repo empty && + test_commit -C empty --author "A <>" A && + test_commit -C empty --author "B " B && + test_commit -C empty --author "C " C && + + test_config -C empty mailmap.file ../empty.map && + cat >>empty.map <<-\EOF && + Ah <> + Bee <> + Cee <> + EOF + + cat >expect <<-\EOF && + Author A <> maps to Bee + Committer C O Mitter maps to C O Mitter + + Author B maps to B + Committer C O Mitter maps to C O Mitter + + Author C maps to C + Committer C O Mitter maps to C O Mitter + EOF + git -C empty log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && + test_cmp expect actual +' + test_done