diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-05-12 17:28:20 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-13 08:45:03 +0900 |
| commit | dd55fc0df15c338a8dbec6dec6ca6b58edc8acef (patch) | |
| tree | 59eba3ec0924940c5c68e54c6a1820022edc0833 /t/t7300-clean.sh | |
| parent | dir: avoid unnecessary traversal into ignored directory (diff) | |
| download | tgif-dd55fc0df15c338a8dbec6dec6ca6b58edc8acef.tar.xz | |
dir: traverse into untracked directories if they may have ignored subfiles
A directory that is untracked does not imply that all files under it
should be categorized as untracked; in particular, if the caller is
interested in ignored files, many files or directories underneath the
untracked directory may be ignored. We previously partially handled
this right with DIR_SHOW_IGNORED_TOO, but missed DIR_SHOW_IGNORED. It
was not obvious, though, because the logic for untracked and excluded
files had been fused together making it harder to reason about. The
previous commit split that logic out, making it easier to notice that
DIR_SHOW_IGNORED was missing. Add it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7300-clean.sh')
| -rwxr-xr-x | t/t7300-clean.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 21e48b3ba5..0399701e62 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -769,7 +769,7 @@ test_expect_success 'avoid traversing into ignored directories' ' test_cmp trace.expect trace.relevant ' -test_expect_failure 'traverse into directories that may have ignored entries' ' +test_expect_success 'traverse into directories that may have ignored entries' ' test_when_finished rm -f output && test_create_repo need-to-traverse-into-hierarchy && ( |