Merge branch 'ss/pull-rebase-preserve'

diff --git a/dir.h b/dir.h
index 6c45e9d4b9a9055539e443ba30166b0b5384bac5..72b73c65dcfc6f31004a032d0706626424ac2241 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -137,6 +137,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);