diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:40:44 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:40:44 +0300 |
| commit | 9cbd2827c5a19d935054cdb162e53e5703be09f4 (patch) | |
| tree | f7850cda5827aacd30b18b9d9f6494d46d3dc4d6 /t/t3512-cherry-pick-submodule.sh | |
| parent | 067aa8fb41d09814d26f82515573b067feba87ba (diff) | |
| parent | ecf9b4a443ecd2c7dc759e5d18f226694bc3eced (diff) | |
Sync with 2.31.5
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 c657840db3..f22d1ddead 100755 --- a/t/t3512-cherry-pick-submodule.sh +++ b/t/t3512-cherry-pick-submodule.sh @@ -16,6 +16,8 @@ fi 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 && |