diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7300-clean.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index fbfdf2da69..32e96da7e3 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -455,7 +455,7 @@ test_expect_success 'nested git work tree' ' ! test -d bar ' -test_expect_failure 'should clean things that almost look like git but are not' ' +test_expect_success 'should clean things that almost look like git but are not' ' rm -fr almost_git almost_bare_git almost_submodule && mkdir -p almost_git/.git/objects && mkdir -p almost_git/.git/refs && @@ -468,8 +468,6 @@ test_expect_failure 'should clean things that almost look like git but are not' garbage EOF test_when_finished "rm -rf almost_*" && - ## This will fail due to die("Invalid gitfile format: %s", path); in - ## setup.c:read_gitfile. git clean -f -d && test_path_is_missing almost_git && test_path_is_missing almost_bare_git && @@ -501,7 +499,7 @@ test_expect_success 'should not clean submodules' ' test_path_is_missing to_clean ' -test_expect_failure 'should avoid cleaning possible submodules' ' +test_expect_success 'should avoid cleaning possible submodules' ' rm -fr to_clean possible_sub1 && mkdir to_clean possible_sub1 && test_when_finished "rm -rf possible_sub*" && @@ -515,7 +513,7 @@ test_expect_failure 'should avoid cleaning possible submodules' ' test_path_is_missing to_clean ' -test_expect_failure 'nested (empty) git should be kept' ' +test_expect_success 'nested (empty) git should be kept' ' rm -fr empty_repo to_clean && git init empty_repo && mkdir to_clean && @@ -537,7 +535,7 @@ test_expect_success 'nested bare repositories should be cleaned' ' test_path_is_missing subdir ' -test_expect_success 'nested (empty) bare repositories should be cleaned even when in .git' ' +test_expect_failure 'nested (empty) bare repositories should be cleaned even when in .git' ' rm -fr strange_bare && mkdir strange_bare && git init --bare strange_bare/.git && |