Merge branch 'cb/common-prefix-unification'

diff --git a/cache.h b/cache.h
index c989f79835a332d879333ee8b927ede150784e54..1aa682d83dfb678f43930a4fa7d816c516d8ee1d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -445,7 +445,6 @@ extern void set_git_work_tree(const char *tree);
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 extern const char **get_pathspec(const char *prefix, const char **pathspec);
-extern const char *pathspec_prefix(const char *prefix, const char **pathspec);
 extern void setup_work_tree(void);
 extern const char *setup_git_directory_gently(int *);
 extern const char *setup_git_directory(void);