diff options
author | Samuel Lijin <sxlijin@gmail.com> | 2017-05-18 04:21:52 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-22 12:14:09 +0900 |
commit | fb898888491b83c9a3396fb559032ca78807a0c0 (patch) | |
tree | 0af74000ad2fcf7f9310422324b1ec70e976c2db /t/t4013 | |
parent | dir: recurse into untracked dirs for ignored files (diff) | |
download | tgif-fb898888491b83c9a3396fb559032ca78807a0c0.tar.xz |
dir: hide untracked contents of untracked dirs
When we taught read_directory_recursive() to recurse into untracked
directories in search of ignored files given DIR_SHOW_IGNORED_TOO, that
had the side effect of teaching it to collect the untracked contents of
untracked directories. It doesn't always make sense to return these,
though (we do need them for `clean -d`), so we introduce a flag
(DIR_KEEP_UNTRACKED_CONTENTS) to control whether or not read_directory()
strips dir->entries of the untracked contents of untracked dirs.
We also introduce check_contains() to check if one dir_entry corresponds
to a path which contains the path corresponding to another dir_entry.
This also fixes known breakages in t7061, since status --ignored now
searches untracked directories for ignored files.
Signed-off-by: Samuel Lijin <sxlijin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013')
0 files changed, 0 insertions, 0 deletions