summaryrefslogtreecommitdiff
path: root/t/lib-merge.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-05-12 17:28:20 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-13 08:45:03 +0900
commitdd55fc0df15c338a8dbec6dec6ca6b58edc8acef (patch)
tree59eba3ec0924940c5c68e54c6a1820022edc0833 /t/lib-merge.sh
parentdir: avoid unnecessary traversal into ignored directory (diff)
downloadtgif-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/lib-merge.sh')
0 files changed, 0 insertions, 0 deletions