Merge branch 'vb/sendemail' into next

diff --git a/dir.h b/dir.h
index e8fc441e7fcc4d53af30881a643853a0ab96f7aa..56a1b7fce224b489aa4ac91766cfb47a3097f197 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -39,12 +39,13 @@ struct dir_struct {
        struct exclude_list exclude_list[3];
 };
 
+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 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 push_exclude_per_directory(struct dir_struct *,
-                                     const char *base, int baselen);
 
 #endif