Sync with 2.30.6

[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 822f2d4bfbd5adc7d7dfce8d6f9c022ac2276b41..10995a48963875fec1ea4a33b5cb8e26780e0ad0 100755 (executable)
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -13,6 +13,8 @@ KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
 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 &&