Sync with 2.31.5

[thirdparty/git.git] / dir.h

diff --git a/dir.h b/dir.h
index 04d886cfce75ed28799bdc29c226cfbc890de5fe..e3db9b9ec658eef53b62cd8a1bd83a5a64389bac 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -336,8 +336,14 @@ struct dir_struct {
        struct oid_stat ss_info_exclude;
        struct oid_stat ss_excludes_file;
        unsigned unmanaged_exclude_files;
+
+       /* Stats about the traversal */
+       unsigned visited_paths;
+       unsigned visited_directories;
 };
 
+struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp);
+
 /*Count the number of slashes for string s*/
 int count_slashes(const char *s);
 
@@ -354,7 +360,7 @@ int count_slashes(const char *s);
 int simple_length(const char *match);
 int no_wildcard(const char *string);
 char *common_prefix(const struct pathspec *pathspec);
-int match_pathspec(const struct index_state *istate,
+int match_pathspec(struct index_state *istate,
                   const struct pathspec *pathspec,
                   const char *name, int namelen,
                   int prefix, char *seen, int is_dir);
@@ -493,12 +499,12 @@ int git_fnmatch(const struct pathspec_item *item,
                const char *pattern, const char *string,
                int prefix);
 
-int submodule_path_match(const struct index_state *istate,
+int submodule_path_match(struct index_state *istate,
                         const struct pathspec *ps,
                         const char *submodule_name,
                         char *seen);
 
-static inline int ce_path_match(const struct index_state *istate,
+static inline int ce_path_match(struct index_state *istate,
                                const struct cache_entry *ce,
                                const struct pathspec *pathspec,
                                char *seen)
@@ -507,7 +513,7 @@ static inline int ce_path_match(const struct index_state *istate,
                              S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode));
 }
 
-static inline int dir_path_match(const struct index_state *istate,
+static inline int dir_path_match(struct index_state *istate,
                                 const struct dir_entry *ent,
                                 const struct pathspec *pathspec,
                                 int prefix, char *seen)