Merge branch 'bw/ls-files-sans-the-index'

diff --git a/cache.h b/cache.h
index d6ba8a2f11a63d4d9ec5257a75532414d22526c0..a666aaf9fd0b211954f14fbefa68d2cc440072f5 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -2193,7 +2193,8 @@ 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 */
-void overlay_tree_on_cache(const char *tree_name, const char *prefix);
+void overlay_tree_on_index(struct index_state *istate,
+                          const char *tree_name, const char *prefix);
 
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);