Merge branch 'js/bundle-verify-require-object-store' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index d18387c255413cfe85b3e25f81e2dc70fcd8b4fa..599fd70e141c7b7252b65ae6603486691864974b 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1439,6 +1439,7 @@ test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
 if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
 then
        GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
+       export GIT_TEST_GETTEXT_POISON
        unset GIT_TEST_GETTEXT_POISON_ORIG
 fi
 
@@ -1521,7 +1522,7 @@ test_lazy_prereq NOT_ROOT '
 '
 
 test_lazy_prereq JGIT '
-       type jgit
+       jgit --version
 '
 
 # SANITY is about "can you correctly predict what the filesystem would