X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=cache.h;h=607c2ea612889c46e81ae375b6985db18e529a8e;hb=5ec8217eb6c89974fda94808a310aa651577b25d;hp=fcf4501a60d14105134a2d5be984afde5dda3e3d;hpb=7c10882c0d299b5d1dbe2c633e95c91ca6152197;p=git.git

diff --git a/cache.h b/cache.h
index fcf4501a6..607c2ea61 100644
--- a/cache.h
+++ b/cache.h
@@ -438,7 +438,7 @@ extern int set_git_dir(const char *path);
 extern const char *get_git_namespace(void);
 extern const char *strip_namespace(const char *namespaced_ref);
 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"
@@ -1195,7 +1195,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);