Merge branch 'lt/objalloc'

diff --git a/dir.c b/dir.c
index 7b91501255e69925629870e575f3a15286cb3f07..6564a929ff66cdffca0666e175c9361149b25b5e 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -375,6 +375,8 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
                return recurse_into_directory;
 
        case index_gitdir:
+               if (dir->show_other_directories)
+                       return ignore_directory;
                return show_directory;
 
        case index_nonexistent: