Merge branch 'sb/merge-friendly'

diff --git a/dir.h b/dir.h
index 56a1b7fce224b489aa4ac91766cfb47a3097f197..550551ab25372c1898ba790e973808ccf0450924 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -43,9 +43,13 @@ 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);
+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 *);
 
 #endif