Merge branch 'lt/rev-list-gitlink'

diff --git a/dir.h b/dir.h
index ec0e8ababc7fa00d9bf039e0ad97d8639b70450f..82009dc13e4b685bc6f4f6e9206d621c7d361c65 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -17,13 +17,20 @@ struct dir_entry {
        char name[FLEX_ARRAY]; /* more */
 };
 
+#define EXC_FLAG_NODIR 1
+#define EXC_FLAG_NOWILDCARD 2
+#define EXC_FLAG_ENDSWITH 4
+
 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;
 };
 
@@ -61,4 +68,10 @@ extern void add_exclude(const char *string, const char *base,
 extern int file_exists(const char *);
 extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
 
+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