Merge branch 'br/svn-doc-include-paths-config' into maint

diff --git a/dir.h b/dir.h
index 6ccbc454ac47da69e1b07b43961b9aaf9a21cbe0..7b5855dd80eda02973a55c827d79826a25937880 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -211,6 +211,7 @@ extern char *common_prefix(const struct pathspec *pathspec);
 extern int match_pathspec(const struct pathspec *pathspec,
                          const char *name, int namelen,
                          int prefix, char *seen, int is_dir);
+extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
 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);