mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailmap: test for silent exiting on missing file/blob

Browse Source 
That we silently ignore missing mailmap.file or mailmap.blob values is
intentional. See 938a60d64f (mailmap: clean up read_mailmap error
handling, 2012-12-12). However, nothing tested for this. Let's do that
by checking that stderr is empty in those cases.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-01-12 21:17:55 +01:00 committed by Junio C Hamano
parent c1fe7fd7e3
commit 56ac194e1d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
t/t4203-mailmap.sh
View File

@ -309,6 +309,24 @@ test_expect_success 'mailmap.file overrides mailmap.blob' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'mailmap.file can be missing' '
test_when_finished "rm .mailmap" &&
cp default.map .mailmap &&
test_config mailmap.file nonexistent &&
cat >expect <<-\EOF &&
Repo Guy (1):
initial
nick1 (1):
second
EOF
git shortlog HEAD >actual 2>err &&
test_must_be_empty err &&
test_cmp expect actual
'
test_expect_success 'mailmap.blob can be missing' ' test_expect_success 'mailmap.blob can be missing' '
test_when_finished "rm .mailmap" && test_when_finished "rm .mailmap" &&
cp default.map .mailmap && cp default.map .mailmap &&
@ -321,7 +339,8 @@ test_expect_success 'mailmap.blob can be missing' '
second second
EOF EOF
git -c mailmap.blob=map:nonexistent shortlog HEAD >actual && git -c mailmap.blob=map:nonexistent shortlog HEAD >actual 2>err &&
test_must_be_empty err &&
test_cmp expect actual test_cmp expect actual
' '