dir.c: git-status --ignored: don't list empty directories as ignored

'git-status --ignored' lists empty untracked directories as ignored, even
though they don't have any ignored files.

When checking if a directory is already listed as untracked (i.e. shouldn't
be listed as ignored as well), don't assume that the directory has only
ignored files if it doesn't have untracked files, as the directory may be
empty.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index 15d7277a0281bdaf631b2b3cc49dcfbe2ae0fa04..fecb6da0aef1fea403d78ed0fcff83f5dbc569cd 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1115,7 +1115,7 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
 
        /*
         * We are looking for ignored files and our directory is not ignored,
 
        /*
         * We are looking for ignored files and our directory is not ignored,

-        * check if it contains only ignored files
+        * check if it contains untracked files (i.e. is listed as untracked)

         */
        if ((dir->flags & DIR_SHOW_IGNORED) && !exclude) {
                int ignored;
         */
        if ((dir->flags & DIR_SHOW_IGNORED) && !exclude) {
                int ignored;


@@ -1123,7 +1123,8 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
                ignored = read_directory_recursive(dir, dirname, len, 1, simplify);
                dir->flags |= DIR_SHOW_IGNORED;
 
                ignored = read_directory_recursive(dir, dirname, len, 1, simplify);
                dir->flags |= DIR_SHOW_IGNORED;
 

-               return ignored ? ignore_directory : show_directory;
+               if (ignored)
+                       return ignore_directory;

        }
 
        if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
        }
 
        if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))

diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index 28b7d957a5268837e2789e2b490d552fbceae5cc..6171a49cf9496d00fc685f3ddf7ddff984cdde0d 100755 (executable)
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -64,13 +64,35 @@ cat >expected <<\EOF
 ?? .gitignore
 ?? actual
 ?? expected
 ?? .gitignore
 ?? actual
 ?? expected

-!! untracked-ignored/

 EOF
 
 EOF
 

-test_expect_success 'status untracked directory with ignored files with --ignore' '
+test_expect_success 'status empty untracked directory with --ignore' '

        rm -rf ignored &&
        mkdir untracked-ignored &&
        mkdir untracked-ignored/test &&
        rm -rf ignored &&
        mkdir untracked-ignored &&
        mkdir untracked-ignored/test &&

+       git status --porcelain --ignored >actual &&
+       test_cmp expected actual
+'
+
+cat >expected <<\EOF
+?? .gitignore
+?? actual
+?? expected
+EOF
+
+test_expect_success 'status empty untracked directory with --ignore -u' '
+       git status --porcelain --ignored -u >actual &&
+       test_cmp expected actual
+'
+
+cat >expected <<\EOF
+?? .gitignore
+?? actual
+?? expected
+!! untracked-ignored/
+EOF
+
+test_expect_success 'status untracked directory with ignored files with --ignore' '

        : >untracked-ignored/ignored &&
        : >untracked-ignored/test/ignored &&
        git status --porcelain --ignored >actual &&
        : >untracked-ignored/ignored &&
        : >untracked-ignored/test/ignored &&
        git status --porcelain --ignored >actual &&