dir.c: Omit non-excluded directories with dir->show_ignored

This makes "git-ls-files --others --directory --ignored" behave
as documented and consequently also fixes "git-clean -d -X".
Previously, git-clean would remove non-excluded directories
even when using the -X option.

Signed-off-by: Michael Spang <mspang@uwaterloo.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/dir.c b/dir.c
index d3063520b03c9c5f608cbd9e97f6b414adb4c5af..11fab7f4bf9b93be33795dfd5c1a3c55c8a8079d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -448,6 +448,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
 
                while ((de = readdir(fdir)) != NULL) {
                        int len;
 
                while ((de = readdir(fdir)) != NULL) {
                        int len;

+                       int exclude;

 
                        if ((de->d_name[0] == '.') &&
                            (de->d_name[1] == 0 ||
 
                        if ((de->d_name[0] == '.') &&
                            (de->d_name[1] == 0 ||


@@ -461,7 +462,9 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
                        memcpy(fullname + baselen, de->d_name, len+1);
                        if (simplify_away(fullname, baselen + len, simplify))
                                continue;
                        memcpy(fullname + baselen, de->d_name, len+1);
                        if (simplify_away(fullname, baselen + len, simplify))
                                continue;

-                       if (excluded(dir, fullname) != dir->show_ignored) {
+
+                       exclude = excluded(dir, fullname);
+                       if (exclude != dir->show_ignored) {

                                if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
                                        continue;
                                }
                                if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
                                        continue;
                                }


@@ -484,6 +487,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
                                len++;
                                switch (treat_directory(dir, fullname, baselen + len, simplify)) {
                                case show_directory:
                                len++;
                                switch (treat_directory(dir, fullname, baselen + len, simplify)) {
                                case show_directory:

+                                       if (exclude != dir->show_ignored)
+                                               continue;

                                        break;
                                case recurse_into_directory:
                                        contents += read_directory_recursive(dir,
                                        break;
                                case recurse_into_directory:
                                        contents += read_directory_recursive(dir,