diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 20:00:04 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 20:00:04 -0400 |
| commit | f64d4ca8d65bdca39da444d24bde94864ac01bb1 (patch) | |
| tree | edc9055c3dc8e378474c951ad6a3513deaa777d0 /t/t7506-status-submodule.sh | |
| parent | Git 2.38 (diff) | |
| parent | Git 2.37.4 (diff) | |
| download | git-f64d4ca8d65bdca39da444d24bde94864ac01bb1.tar.gz git-f64d4ca8d65bdca39da444d24bde94864ac01bb1.zip | |
Sync with 2.37.4
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t7506-status-submodule.sh')
| -rwxr-xr-x | t/t7506-status-submodule.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index f5426a8e58..d050091345 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -252,6 +252,7 @@ test_expect_success 'status with merge conflict in .gitmodules' ' test_create_repo_with_commit sub1 && test_tick && test_create_repo_with_commit sub2 && + test_config_global protocol.file.allow always && ( cd super && prev=$(git rev-parse HEAD) && @@ -327,6 +328,7 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' # sub2 will have an untracked file # sub3 will have an untracked repository test_expect_success 'setup superproject with untracked file in nested submodule' ' + test_config_global protocol.file.allow always && ( cd super && git clean -dfx && |