Sync with 2.31.5

[thirdparty/git.git] / t / t3512-cherry-pick-submodule.sh

diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index c657840db33b6e8d4c47ece5c9eb0feba495825a..f22d1ddead1ac94de714f61fc10b87cc4bae3aec 100755 (executable)
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -16,6 +16,8 @@ fi
 test_submodule_switch "cherry-pick"
 
 test_expect_success 'unrelated submodule/file conflict is ignored' '
+       test_config_global protocol.file.allow always &&
+
        test_create_repo sub &&
 
        touch sub/file &&