aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:17 -0700
commitca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4 (patch)
tree95b3ad81be30f2d56be61e1a68c06ea6a450f93d /cache.h
parent9488c18923f40573b692dbb8ea9c85c3cb4550a7 (diff)
parentf950eb956092831730182daa7160eaa352277fa9 (diff)
downloadgit-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.tar.gz
git-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.tar.xz
Merge branch 'cb/common-prefix-unification'
* cb/common-prefix-unification: rename pathspec_prefix() to common_prefix() and move to dir.[ch] consolidate pathspec_prefix and common_prefix remove prefix argument from pathspec_prefix
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index c989f7983..1aa682d83 100644
--- 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);