summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-29 10:08:19 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-29 10:08:19 -0800
commitc889763bf33e9b54843dc93ba3bb38803f86a6cf (patch)
treea8bcfbf97425de0ca6bc1b41c1a06ad9eb3162bd /dir.h
parent8757749ecbabbcf7f1a68c17529f02bf7702b424 (diff)
downloadgit-c889763bf33e9b54843dc93ba3bb38803f86a6cf.tar.gz
Revert "read_directory: show_both option."
This reverts commit 4888c534099012d71d24051deb5b14319747bd1a.
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/dir.h b/dir.h
index 08c6345472..c919727949 100644
--- a/dir.h
+++ b/dir.h
@@ -13,8 +13,7 @@
struct dir_entry {
- unsigned ignored_entry : 1;
- unsigned int len : 15;
+ int len;
char name[FLEX_ARRAY]; /* more */
};
@@ -30,8 +29,7 @@ struct exclude_list {
struct dir_struct {
int nr, alloc;
- unsigned int show_both: 1,
- show_ignored:1,
+ unsigned int show_ignored:1,
show_other_directories:1,
hide_empty_directories:1;
struct dir_entry **entries;