diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:39:15 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-07 00:39:15 +0300 |
| commit | 122512967e6184b1888a63ea2b6ed9ada3046b28 (patch) | |
| tree | 91a2c08868d550b5ce21efd7176c4d2d634bc44f /t/t3600-rm.sh | |
| parent | 5b1c746c352e85211770e5cbd26a433b3affd3b4 (diff) | |
| parent | abd4d67ab0f84fff703fa14d9eebfd287b42daeb (diff) | |
Sync with 2.30.6
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t3600-rm.sh')
| -rwxr-xr-x | t/t3600-rm.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index bb9ef35dac..a0eda54cde 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -336,7 +336,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 && @@ -642,6 +642,7 @@ cat >expect.deepmodified <<EOF EOF test_expect_success 'setup subsubmodule' ' + test_config_global protocol.file.allow always && git reset --hard && git submodule update && ( |