X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=6b24c252ef5c8d56b06cf0f00934fc79e46f022c;hb=5238cbf65638d7a097bdb5ca8226f5acbe31f143;hp=be506187f89c4dcdc125545482e51c15c6edcbb0;hpb=8516c1c231272e3c8fb42ba34306c776e6a90409;p=git.git

diff --git a/cache.h b/cache.h
index be506187f..6b24c252e 100644
--- a/cache.h
+++ b/cache.h
@@ -434,7 +434,7 @@ extern char *get_index_file(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
 extern const char *get_git_work_tree(void);
-extern const char *read_gitfile_gently(const char *path);
+extern const char *read_gitfile(const char *path);
 extern void set_git_work_tree(const char *tree);
 
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -1189,7 +1189,7 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
 #define ws_tab_width(rule)     ((rule) & WS_TAB_WIDTH_MASK)
 
 /* ls-files */
-int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
+int report_path_error(const char *ps_matched, const char **pathspec, const char *prefix);
 void overlay_tree_on_cache(const char *tree_name, const char *prefix);
 
 char *alias_lookup(const char *alias);