From: Ævar Arnfjörð Bjarmason Date: Thu, 11 Feb 2021 01:53:50 GMT Subject: [PATCH 1/4] tests: remove last uses of GIT_TEST_GETTEXT_POISON=false Message-ID: <20210211015353.28680-2-avarab@gmail.com> In-Reply-To: <20210120182759.31102-1-avarab@gmail.com> Follow-up my 73c01d25fe2 (tests: remove uses of GIT_TEST_GETTEXT_POISON=false, 2021-01-20) by removing the last uses of GIT_TEST_GETTEXT_POISON=*. These assignments were part of branch that was in-flight at the time of the gettext poison removal. See 466f94ec45e (Merge branch 'ab/detox-gettext-tests', 2021-02-10) and c7d6d419b0d (Merge branch 'ab/mktag', 2021-01-25) for the merging of the two branches. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 86bfeb271ec..60a666da595 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -13,13 +13,11 @@ test_description='git mktag: tag object verify test' check_verify_failure () { test_expect_success "$1" " - test_must_fail env GIT_TEST_GETTEXT_POISON=false \ - git mktag message && + test_must_fail git mktag message && grep '$2' message && if test '$3' != '--no-strict' then - test_must_fail env GIT_TEST_GETTEXT_POISON=false \ - git mktag --no-strict message.no-strict && + test_must_fail git mktag --no-strict message.no-strict &&xb grep '$2' message.no-strict fi " @@ -443,11 +441,9 @@ test_expect_success 'invalid header entry config & fsck' ' git -c fsck.extraHeaderEntry=ignore mktag --no-strict err && + git -c fsck.extraHeaderEntry=warn fsck 2>err && grep "warning .*extraHeaderEntry:" err && - test_must_fail env GIT_TEST_GETTEXT_POISON=false \ - git -c fsck.extraHeaderEntry=error 2>err fsck && + test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck && grep "error .* extraHeaderEntry:" err ' -- 2.30.0.284.gd98b1dd5eaa7