Merge branch 'es/grep-require-name-when-needed'

diff --git a/dir.h b/dir.h
index 2e6fcba389cc93cd9b8a5f9915c38968d512cc6d..680079bbe3241ff84fc8260009515f03b6ba819e 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -220,7 +220,7 @@ int match_pathspec(const struct index_state *istate,
                   const struct pathspec *pathspec,
                   const char *name, int namelen,
                   int prefix, char *seen, int is_dir);
-int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
+int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
 int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 int fill_directory(struct dir_struct *dir,
@@ -269,6 +269,8 @@ void add_exclude(const char *string, const char *base,
                 int baselen, struct exclude_list *el, int srcpos);
 void clear_exclude_list(struct exclude_list *el);
 void clear_directory(struct dir_struct *dir);
+
+int repo_file_exists(struct repository *repo, const char *path);
 int file_exists(const char *);
 
 int is_inside_dir(const char *dir);