summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-01-12 21:17:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-12 14:04:40 -0800
commit400d160e39509fc5d7051f7338293b793cded9e3 (patch)
treec61aa48fcdfa21c04b2289326af2fd6770fd00ed
parentmailmap tests: remove redundant entry in test (diff)
downloadtgif-400d160e39509fc5d7051f7338293b793cded9e3.tar.xz
mailmap tests: add a test for "not a blob" error
Add a test for one of the error conditions added in 938a60d64f (mailmap: clean up read_mailmap error handling, 2012-12-12). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4203-mailmap.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 03a98d9635..78d56e0566 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -333,6 +333,15 @@ test_expect_success 'mailmap.blob can be missing' '
test_cmp expect actual
'
+test_expect_success 'mailmap.blob might be the wrong type' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err &&
+ test_i18ngrep "mailmap is not a blob" err &&
+ test_cmp expect actual
+'
+
test_expect_success 'mailmap.blob defaults to off in non-bare repo' '
git init non-bare &&
(