aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4060-diff-submodule-option-diff-format.sh
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2022-07-29 15:20:43 -0400
committerTaylor Blau <me@ttaylorr.com>2022-10-01 00:23:38 -0400
commitac7e57fa288260341bdbd5e9abcdd24eaf214740 (patch)
treeb52e3ba0d6f5e984b7fe3df7c66cd696575cf10a /t/t4060-diff-submodule-option-diff-format.sh
parentf8d510ed0b357787c8d035d64f240bd82b424dc4 (diff)
downloadgit-ac7e57fa288260341bdbd5e9abcdd24eaf214740.tar.gz
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>
Diffstat (limited to 't/t4060-diff-submodule-option-diff-format.sh')
-rwxr-xr-xt/t4060-diff-submodule-option-diff-format.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index fc8229c726..57b19125c0 100755
--- 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)
'