summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 15:32:34 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-03 15:32:35 -0800
commit1bf986bc9c1e823da27465bfd9faf2b725bbcc09 (patch)
treeb47aa7c235ebf2bf958f7906e58a0750a418f0db /cache.h
parentc1324e66d44b7d58915cd7e61c1ea85ed3db6a58 (diff)
parent11f9dd719104a960d3e2b478477d9055141d1dbc (diff)
downloadgit-1bf986bc9c1e823da27465bfd9faf2b725bbcc09.tar.gz
Merge branch 'mk/submodule-gitdir-path' into maint
The submodule code has been taught to work better with separate work trees created via "git worktree add". * mk/submodule-gitdir-path: path: implement common_dir handling in git_pathdup_submodule() submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
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 df3192144a..d941224de5 100644
--- a/cache.h
+++ b/cache.h
@@ -443,6 +443,7 @@ extern char *get_object_directory(void);
extern char *get_index_file(void);
extern char *get_graft_file(void);
extern int set_git_dir(const char *path);
+extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
extern int get_common_dir(struct strbuf *sb, const char *gitdir);
extern const char *get_git_namespace(void);
extern const char *strip_namespace(const char *namespaced_ref);