diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-16 17:58:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 17:58:28 -0700 |
commit | 1a15fed84a511b86feaed7731850a5629d76a97f (patch) | |
tree | d258bc56cc357e5d57b988a362f1f682524842ec /dir.h | |
parent | c927e6c69b50877e116340671ed35aaf6d3a8f49 (diff) | |
parent | e96980ef8164f266308ea5fec536863a629866dc (diff) | |
download | git-1a15fed84a511b86feaed7731850a5629d76a97f.tar.gz git-1a15fed84a511b86feaed7731850a5629d76a97f.tar.xz |
Merge branch 'jk/add-empty' into ei/oneline+add-empty
* jk/add-empty:
builtin-add: simplify (and increase accuracy of) exclude handling
dir_struct: add collect_ignored option
Diffstat (limited to 'dir.h')
-rw-r--r-- | dir.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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; |