Merge branch 'cb/add-pathspec'

diff --git a/cache.h b/cache.h
index 8d965b8c981d80a252dd69ca32d8e44fa545177a..c96854a0d67a84bde5d139a3d6d7ba058a10181e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -937,7 +937,6 @@ extern int ws_fix_copy(char *, const char *, int, unsigned, int *);
 extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
 
 /* ls-files */
-int pathspec_match(const char **spec, char *matched, const char *filename, int skiplen);
 int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
 void overlay_tree_on_cache(const char *tree_name, const char *prefix);