Restructures the patch series so that everything works properly. I also noticed while redoing it that I didn't properly fix the clean -d bug before; while it wouldn't remove a directory with only untracked and ignored files, it would miss the untracked contents of such a directory. That's now been fixed. Samuel Lijin (8): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse into untracked dirs for ignored files dir: hide untracked contents of untracked dirs dir: expose cmp_name() and check_contains() clean: teach clean -d to skip dirs containing ignored files t7300: clean -d now skips untracked dirs containing ignored files t7061: status --ignored now searches untracked dirs builtin/clean.c | 32 ++++++++++++++++++++-- dir.c | 67 +++++++++++++++++++++++++++++++++++++++++++--- dir.h | 6 ++++- t/t7061-wtstatus-ignore.sh | 1 + t/t7300-clean.sh | 11 ++++++++ 5 files changed, 110 insertions(+), 7 deletions(-) -- 2.12.2