define a structure for object IDs

diff --git a/dir.h b/dir.h
index 9b7e4e77d8b11bab92a91a6ce3e8920e50d23f9b..6c45e9d4b9a9055539e443ba30166b0b5384bac5 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -15,6 +15,27 @@ struct dir_entry {
 #define EXC_FLAG_MUSTBEDIR 8
 #define EXC_FLAG_NEGATIVE 16
 
+struct exclude {
+       /*
+        * This allows callers of last_exclude_matching() etc.
+        * to determine the origin of the matching pattern.
+        */
+       struct exclude_list *el;
+
+       const char *pattern;
+       int patternlen;
+       int nowildcardlen;
+       const char *base;
+       int baselen;
+       int flags;
+
+       /*
+        * Counting starts from 1 for line numbers in ignore files,
+        * and from -1 decrementing for patterns from CLI args.
+        */
+       int srcpos;
+};
+
 /*
  * Each excludes file will be parsed into a fresh exclude_list which
  * is appended to the relevant exclude_list_group (either EXC_DIRS or
@@ -32,26 +53,7 @@ struct exclude_list {
        /* origin of list, e.g. path to filename, or descriptive string */
        const char *src;
 
-       struct exclude {
-               /*
-                * This allows callers of last_exclude_matching() etc.
-                * to determine the origin of the matching pattern.
-                */
-               struct exclude_list *el;
-
-               const char *pattern;
-               int patternlen;
-               int nowildcardlen;
-               const char *base;
-               int baselen;
-               int flags;
-
-               /*
-                * Counting starts from 1 for line numbers in ignore files,
-                * and from -1 decrementing for patterns from CLI args.
-                */
-               int srcpos;
-       } **excludes;
+       struct exclude **excludes;
 };
 
 /*
@@ -117,7 +119,7 @@ struct dir_struct {
         */
        struct exclude_stack *exclude_stack;
        struct exclude *exclude;
-       char basebuf[PATH_MAX];
+       struct strbuf basebuf;
 };
 
 /*
@@ -132,9 +134,9 @@ struct dir_struct {
 extern int simple_length(const char *match);
 extern int no_wildcard(const char *string);
 extern char *common_prefix(const struct pathspec *pathspec);
-extern int match_pathspec_depth(const struct pathspec *pathspec,
-                               const char *name, int namelen,
-                               int prefix, char *seen);
+extern int match_pathspec(const struct pathspec *pathspec,
+                         const char *name, int namelen,
+                         int prefix, char *seen, int is_dir);
 extern int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);
@@ -205,4 +207,22 @@ extern int git_fnmatch(const struct pathspec_item *item,
                       const char *pattern, const char *string,
                       int prefix);
 
+static inline int ce_path_match(const struct cache_entry *ce,
+                               const struct pathspec *pathspec,
+                               char *seen)
+{
+       return match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen,
+                             S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode));
+}
+
+static inline int dir_path_match(const struct dir_entry *ent,
+                                const struct pathspec *pathspec,
+                                int prefix, char *seen)
+{
+       int has_trailing_dir = ent->len && ent->name[ent->len - 1] == '/';
+       int len = has_trailing_dir ? ent->len - 1 : ent->len;
+       return match_pathspec(pathspec, ent->name, len, prefix, seen,
+                             has_trailing_dir);
+}
+
 #endif