summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-02-16 12:20:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-18 19:04:19 (GMT)
commit7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7 (patch)
treefc42dc10878370068d77dbbfb94cb2475561a0b1 /dir.h
parent81d3fe9f4871e42ebd1af0221fa091fe5476e2f7 (diff)
downloadgit-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.zip
git-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.gz
git-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.bz2
Turn the flags in struct dir_struct into a single variable
By having flags represented as bits in the new member variable 'flags', it will be easier to use parse_options when dir_struct is involved. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/dir.h b/dir.h
index bdc2d47..541286a 100644
--- a/dir.h
+++ b/dir.h
@@ -34,11 +34,13 @@ struct exclude_stack {
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,
- collect_ignored:1;
+ enum {
+ DIR_SHOW_IGNORED = 1<<0,
+ DIR_SHOW_OTHER_DIRECTORIES = 1<<1,
+ DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
+ DIR_NO_GITLINKS = 1<<3,
+ DIR_COLLECT_IGNORED = 1<<4
+ } flags;
struct dir_entry **entries;
struct dir_entry **ignored;