unpack-objects: fix --strict handling

diff --git a/dir.h b/dir.h
index a248a23ac4eab2aff1e91060f0e9281a8842bf6b..2df15defb6720a742282f24721233c4816deceb6 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -1,32 +1,36 @@
 #ifndef DIR_H
 #define DIR_H
 
-/*
- * We maintain three exclude pattern lists:
- * EXC_CMDL lists patterns explicitly given on the command line.
- * EXC_DIRS lists patterns obtained from per-directory ignore files.
- * EXC_FILE lists patterns from fallback ignore files.
- */
-#define EXC_CMDL 0
-#define EXC_DIRS 1
-#define EXC_FILE 2
-
-
 struct dir_entry {
        unsigned int len;
        char name[FLEX_ARRAY]; /* more */
 };
 
+#define EXC_FLAG_NODIR 1
+#define EXC_FLAG_NOWILDCARD 2
+#define EXC_FLAG_ENDSWITH 4
+#define EXC_FLAG_MUSTBEDIR 8
+
 struct exclude_list {
        int nr;
        int alloc;
        struct exclude {
                const char *pattern;
+               int patternlen;
                const char *base;
                int baselen;
+               int to_exclude;
+               int flags;
        } **excludes;
 };
 
+struct exclude_stack {
+       struct exclude_stack *prev;
+       char *filebuf;
+       int baselen;
+       int exclude_ix;
+};
+
 struct dir_struct {
        int nr, alloc;
        int ignored_nr, ignored_alloc;
@@ -41,6 +45,18 @@ struct dir_struct {
        /* Exclude info */
        const char *exclude_per_dir;
        struct exclude_list exclude_list[3];
+       /*
+        * We maintain three exclude pattern lists:
+        * EXC_CMDL lists patterns explicitly given on the command line.
+        * EXC_DIRS lists patterns obtained from per-directory ignore files.
+        * EXC_FILE lists patterns from fallback ignore files.
+        */
+#define EXC_CMDL 0
+#define EXC_DIRS 1
+#define EXC_FILE 2
+
+       struct exclude_stack *exclude_stack;
+       char basebuf[PATH_MAX];
 };
 
 extern int common_prefix(const char **pathspec);
@@ -51,10 +67,8 @@ extern int common_prefix(const char **pathspec);
 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, 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 int excluded(struct dir_struct *, const char *, int *);
 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);
@@ -64,6 +78,7 @@ extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathna
 extern char *get_relative_cwd(char *buffer, int size, const char *dir);
 extern int is_inside_dir(const char *dir);
 
+extern void setup_standard_excludes(struct dir_struct *dir);
 extern int remove_dir_recursively(struct strbuf *path, int only_empty);
 
 #endif