Merge branch 'jh/trace2-sid-fix'

diff --git a/dir.h b/dir.h
index 823bae628bc8db03dee6ef0c5601b05a6ea942f5..c23313b02126f97e63e5694bdc02907363fe077d 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -269,7 +269,9 @@ extern void add_exclude(const char *string, const char *base,
                        int baselen, struct exclude_list *el, int srcpos);
 extern void clear_exclude_list(struct exclude_list *el);
 extern void clear_directory(struct dir_struct *dir);
-extern int file_exists(const char *);
+
+int repo_file_exists(struct repository *repo, const char *path);
+int file_exists(const char *);
 
 extern int is_inside_dir(const char *dir);
 extern int dir_inside_of(const char *subdir, const char *dir);