mailmap tests: add tests for whitespace syntax

avar · gitster · commit 9e2a14a88953 · 2021-01-12T14:04:42.000-08:00
Add tests for mailmap's handling of whitespace, i.e. how it trims
space within "&lt;&gt;" and around author names.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
@@ -786,4 +786,56 @@ test_expect_success 'comment syntax: setup' '
 	test_cmp expect actual
 '
 
+test_expect_success 'whitespace syntax: setup' '
+	test_create_repo space &&
+	test_commit -C space --author "A <a@example.com>" A &&
+	test_commit -C space --author "B <b@example.com>" B &&
+	test_commit -C space --author " C <c@example.com>" C &&
+	test_commit -C space --author " D  <d@example.com>" D &&
+	test_commit -C space --author "E E <e@example.com>" E &&
+	test_commit -C space --author "F  F <f@example.com>" F &&
+	test_commit -C space --author "G   G <g@example.com>" G &&
+	test_commit -C space --author "H   H <h@example.com>" H &&
+
+	test_config -C space mailmap.file ../space.map &&
+	cat >>space.map <<-\EOF &&
+	Ah <ah@example.com> < a@example.com >
+	Bee <bee@example.com  > <  b@example.com  >
+	Cee <cee@example.com> C <c@example.com>
+	dee <dee@example.com>  D  <d@example.com>
+	eee <eee@example.com> E E <e@example.com>
+	eff <eff@example.com> F  F <f@example.com>
+	gee <gee@example.com> G   G <g@example.com>
+	aitch <aitch@example.com> H  H <h@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author A <a@example.com> maps to A <a@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author B <b@example.com> maps to B <b@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author C <c@example.com> maps to Cee <cee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author D <d@example.com> maps to dee <dee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author E E <e@example.com> maps to eee <eee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author F  F <f@example.com> maps to eff <eff@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author G   G <g@example.com> maps to gee <gee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author H   H <h@example.com> maps to H   H <h@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C space 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

-Original file line number
+Diff line change
 	test_cmp expect actual
+'
 +test_expect_success 'whitespace syntax: setup' '
 +	test_create_repo space &&
 +	test_commit -C space --author "A <[email protected]>" A &&
 +	test_commit -C space --author "B <[email protected]>" B &&
 +	test_commit -C space --author " C <[email protected]>" C &&
 +	test_commit -C space --author " D  <[email protected]>" D &&
 +	test_commit -C space --author "E E <[email protected]>" E &&
 +	test_commit -C space --author "F  F <[email protected]>" F &&
 +	test_commit -C space --author "G   G <[email protected]>" G &&
 +	test_commit -C space --author "H   H <[email protected]>" H &&
++
 +	test_config -C space mailmap.file ../space.map &&
 +	cat >>space.map <<-\EOF &&
 +	Ah <[email protected]> < [email protected] >
 +	Bee <[email protected]  > <  [email protected]  >
 +	Cee <[email protected]> C <[email protected]>
 +	dee <[email protected]>  D  <[email protected]>
 +	eee <[email protected]> E E <[email protected]>
 +	eff <[email protected]> F  F <[email protected]>
 +	gee <[email protected]> G   G <[email protected]>
 +	aitch <[email protected]> H  H <[email protected]>
 +	EOF
++
 +	cat >expect <<-\EOF &&
 +	Author A <[email protected]> maps to A <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author B <[email protected]> maps to B <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author C <[email protected]> maps to Cee <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author D <[email protected]> maps to dee <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author E E <[email protected]> maps to eee <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author F  F <[email protected]> maps to eff <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author G   G <[email protected]> maps to gee <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
++
 +	Author H   H <[email protected]> maps to H   H <[email protected]>
 +	Committer C O Mitter <[email protected]> maps to C O Mitter <[email protected]>
 +	EOF
 +	git -C space 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