Start deprecating "git-command" in favor of "git command"

diff --git a/dir.h b/dir.h
index 172147fd3d4711c9ea95cd76048b7188bf9a1e2c..ec0e8ababc7fa00d9bf039e0ad97d8639b70450f 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -13,9 +13,7 @@
 
 
 struct dir_entry {
-       unsigned int ignored : 1;
-       unsigned int ignored_dir : 1;
-       unsigned int len : 30;
+       unsigned int len;
        char name[FLEX_ARRAY]; /* more */
 };
 
@@ -31,11 +29,14 @@ struct exclude_list {
 
 struct dir_struct {
        int nr, alloc;
+       int ignored_nr, ignored_alloc;
        unsigned int show_ignored:1,
                     show_other_directories:1,
                     hide_empty_directories:1,
-                    no_gitlinks:1;
+                    no_gitlinks:1,
+                    collect_ignored:1;
        struct dir_entry **entries;
+       struct dir_entry **ignored;
 
        /* Exclude info */
        const char *exclude_per_dir;