[PATCH 6/7] builtin/clean: teach clean -d to skip dirs containing ignored files

[Samuel Lijin]

There is an implicit assumption that a directory containing only
untracked and ignored files should itself be considered untracked. This
makes sense in use cases where we're asking if a directory should be
added to the git database, but not when we're asking if a directory can
be safely removed from the working tree; as a result, clean -d would
assume that an "untracked" directory containing ignored files could be
deleted.

To get around this, we teach clean -d to collect ignored files and skip
over so-called "untracked" directories if they contain any ignored
files.
---
 builtin/clean.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/builtin/clean.c b/builtin/clean.c
index d861f836a..368e19427 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -859,7 +859,7 @@ static void interactive_main_loop(void)
 
 int cmd_clean(int argc, const char **argv, const char *prefix)
 {
-       int i, res;
+       int i, j, res;
        int dry_run = 0, remove_directories = 0, quiet = 0, ignored = 0;
        int ignored_only = 0, config_set = 0, errors = 0, gone = 1;
        int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT;
@@ -911,6 +911,9 @@ int cmd_clean(int argc, const char **argv, const char 
*prefix)
                                  " refusing to clean"));
        }
 
+       if (remove_directories)
+               dir.flags |= DIR_SHOW_IGNORED_TOO;
+
        if (force > 1)
                rm_flags = 0;
 
@@ -932,7 +935,7 @@ int cmd_clean(int argc, const char **argv, const char 
*prefix)
 
        fill_directory(&dir, &pathspec);
 
-       for (i = 0; i < dir.nr; i++) {
+       for (j = i = 0; i < dir.nr; i++) {
                struct dir_entry *ent = dir.entries[i];
                int matches = 0;
                struct stat st;
@@ -954,10 +957,27 @@ int cmd_clean(int argc, const char **argv, const char 
*prefix)
                    matches != MATCHED_EXACTLY)
                        continue;
 
+               // skip any dir.entries which contains a dir.ignored
+               for (; j < dir.ignored_nr; j++) {
+                       if (cmp_name(&dir.entries[i],
+                                               &dir.ignored[j]) < 0)
+                               break;
+               }
+               if ((j < dir.ignored_nr) &&
+                               check_contains(dir.entries[i], dir.ignored[j])) 
{
+                       continue;
+               }
+
                rel = relative_path(ent->name, prefix, &buf);
                string_list_append(&del_list, rel);
        }
 
+       for (i = 0; i < dir.nr; i++)
+               free(dir.entries[i]);
+
+       for (i = 0; i < dir.ignored_nr; i++)
+               free(dir.ignored[i]);
+
        if (interactive && del_list.nr > 0)
                interactive_main_loop();
 
-- 
2.12.2