t/t4NNN: allow local submodules

To prepare for the default value of `protocol.file.allow` to change to
"user", ensure tests that rely on local submodules can initialize them
over the file protocol.

Tests that only need to interact with submodules in a limited capacity
have individual Git commands annotated with the appropriate
configuration via `-c`. Tests that interact with submodules a handful of
times use `test_config_global` instead. Test scripts that rely on
submodules throughout use a `git config --global` during a setup test
towards the beginning of the script.

Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh
index 49bca7b48d910fa1128435f121c849e45a7eefa6..d489230df89663620fda4a11b538fc740720a8aa 100755 (executable)
--- a/t/t4059-diff-submodule-not-initialized.sh
+++ b/t/t4059-diff-submodule-not-initialized.sh
@@ -49,7 +49,7 @@ test_expect_success 'setup - submodules' '
 '
 
 test_expect_success 'setup - git submodule add' '
-       git submodule add ./sm2 sm1 &&
+       git -c protocol.file.allow=always submodule add ./sm2 sm1 &&
        commit_file sm1 .gitmodules &&
        git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
        cat >expected <<-EOF &&

diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index fc8229c7260b5c852dd22bd035392558aacf23a5..57b19125c0da285d2049c823f0977b69c624cd97 100755 (executable)
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -759,9 +759,9 @@ test_expect_success 'diff --submodule=diff with .git file' '
 '
 
 test_expect_success 'setup nested submodule' '
-       git submodule add -f ./sm2 &&
+       git -c protocol.file.allow=always submodule add -f ./sm2 &&
        git commit -a -m "add sm2" &&
-       git -C sm2 submodule add ../sm2 nested &&
+       git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
        git -C sm2 commit -a -m "nested sub" &&
        head10=$(git -C sm2 rev-parse --short --verify HEAD)
 '

diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
index 804f2a82e8315d4f5936894adf7846769d2e201d..28f42a4046e08ed61fcf2f300b826c33136e9e98 100755 (executable)
--- a/t/t4067-diff-partial-clone.sh
+++ b/t/t4067-diff-partial-clone.sh
@@ -77,6 +77,7 @@ test_expect_success 'diff skips same-OID blobs' '
 
 test_expect_success 'when fetching missing objects, diff skips GITLINKs' '
        test_when_finished "rm -rf sub server client trace" &&
+       test_config_global protocol.file.allow always &&
 
        test_create_repo sub &&
        test_commit -C sub first &&

diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 6cdbe4747aa837376fd01c94420beb1bd1bb6d56..aeaf0d5ba353120495d44a25b5af5d6a2e0f0a88 100755 (executable)
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -126,6 +126,7 @@ test_expect_success 'command line pathspec parsing for "git log"' '
 
 test_expect_success 'tree_entry_interesting does not match past submodule boundaries' '
        test_when_finished "rm -rf repo submodule" &&
+       test_config_global protocol.file.allow always &&
        git init submodule &&
        test_commit -C submodule initial &&
        git init repo &&