summaryrefslogtreecommitdiffstats
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2022-07-29 21:20:28 +0200
committerTaylor Blau <me@ttaylorr.com>2022-10-01 06:23:38 +0200
commitf8d510ed0b357787c8d035d64f240bd82b424dc4 (patch)
treec9417701e9163020d3eba1b562c08d814db45245 /t/t3600-rm.sh
parentt/2NNNN: allow local submodules (diff)
downloadgit-f8d510ed0b357787c8d035d64f240bd82b424dc4.tar.xz
git-f8d510ed0b357787c8d035d64f240bd82b424dc4.zip
t/t3NNN: 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>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index efec8d13b6..99dab76332 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -321,7 +321,7 @@ test_expect_success 'rm removes empty submodules from work tree' '
test_expect_success 'rm removes removed submodule from index and .gitmodules' '
git reset --hard &&
- git submodule update &&
+ git -c protocol.file.allow=always submodule update &&
rm -rf submod &&
git rm submod &&
git status -s -uno --ignore-submodules=none >actual &&
@@ -627,6 +627,7 @@ cat >expect.deepmodified <<EOF
EOF
test_expect_success 'setup subsubmodule' '
+ test_config_global protocol.file.allow always &&
git reset --hard &&
git submodule update &&
(