diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-07-29 22:20:28 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-01 07:23:38 +0300 |
| commit | f8d510ed0b357787c8d035d64f240bd82b424dc4 (patch) | |
| tree | c9417701e9163020d3eba1b562c08d814db45245 /t/t3512-cherry-pick-submodule.sh | |
| parent | 99f4abb8dae4c9c604e5d5cf255958bbe537b928 (diff) | |
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/t3512-cherry-pick-submodule.sh')
| -rwxr-xr-x | t/t3512-cherry-pick-submodule.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh index 6ece1d8573..697bc68958 100755 --- a/t/t3512-cherry-pick-submodule.sh +++ b/t/t3512-cherry-pick-submodule.sh @@ -10,6 +10,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 && |