Re: [PATCH v3 0/4] Add support for mailmap in cat-file
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 12, 2022, 16:06 UTC
- Message-ID
- <xmqqy1wygvse.fsf@gitster.g>
- In-Reply-To
- <xmqqwnciifgv.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> The cat-file tests does not have to use the "map" file to do its > thing at all. In fact, these tests prepare their own .mailmap file > inside them. But because it chose to run in the history prepared by > previous tests, it broke, because without SYMLINKS, the sought-for > commit does not get created.
So, an alternative solution is to keep the existing tests on symlinks totally unrelated to these new tests. These cat-file tests can prepare the commit to munge at the beginning of the sequence, and then do its thing. This way, a platform without symlink support does not have to create the "map" file that nobody uses, something like the attached.
I do not have strong preference either way, though.
t/t4203-mailmap.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git c/t/t4203-mailmap.sh w/t/t4203-mailmap.sh index c60a90615c..cd1cab3e54 100755 --- c/t/t4203-mailmap.sh +++ w/t/t4203-mailmap.sh @@ -963,6 +963,11 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' ' test_cmp expect actual ' +test_expect_success 'prepare for cat-file --mailmap' ' + rm -f .mailmap && + git commit --allow-empty -m foo --author="Orig <orig@example.com>" +' + test_expect_success '--no-use-mailmap disables mailmap in cat-file' ' test_when_finished "rm .mailmap" && cat >.mailmap <<-EOF &&