add_cache_entry(): removal of file foo does not conflict with foo/bar

diff --git a/dir.h b/dir.h
index 313f8ab64e7e3a6be1d22335eb54872c929d857e..33c31f25fbabc36db26e6fdf9f33381f166d2d7f 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -13,7 +13,9 @@
 
 
 struct dir_entry {
-       int len;
+       unsigned int ignored : 1;
+       unsigned int ignored_dir : 1;
+       unsigned int len : 30;
        char name[FLEX_ARRAY]; /* more */
 };
 
@@ -40,13 +42,21 @@ struct dir_struct {
 };
 
 extern int common_prefix(const char **pathspec);
+
+#define MATCHED_RECURSIVELY 1
+#define MATCHED_FNMATCH 2
+#define MATCHED_EXACTLY 3
 extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
 
-extern int read_directory(struct dir_struct *, const char *path, const char *base, int baselen);
+extern int read_directory(struct dir_struct *, const char *path, const char *base, int baselen, const char **pathspec);
+extern int push_exclude_per_directory(struct dir_struct *, const char *, int);
+extern void pop_exclude_per_directory(struct dir_struct *, int);
+
 extern int excluded(struct dir_struct *, const char *);
 extern void add_excludes_from_file(struct dir_struct *, const char *fname);
 extern void add_exclude(const char *string, const char *base,
                        int baselen, struct exclude_list *which);
 extern int file_exists(const char *);
+extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
 
 #endif