summaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-11 00:56:16 +0200
committerJunio C Hamano <gitster@pobox.com>2011-10-11 00:56:17 +0200
commitefc5fb6a77780c53c6636326ca82ff87b17e4c5f (patch)
treedf55c7da6100b8b102b183dee72c9137b0d68075 /cache.h
parentFix some "variable might be used uninitialized" warnings (diff)
parentMove git-dir for submodules (diff)
downloadgit-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.tar.xz
git-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.zip
Merge branch 'fg/submodule-git-file-git-dir'
* fg/submodule-git-file-git-dir: Move git-dir for submodules rev-parse: add option --resolve-git-dir <path> Conflicts: cache.h git-submodule.sh
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 82e12c862c..c989f79835 100644
--- a/cache.h
+++ b/cache.h
@@ -439,6 +439,7 @@ 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(const char *path);
+extern const char *resolve_gitdir(const char *suspect);
extern void set_git_work_tree(const char *tree);
#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"