diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:34 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:35 +0300 |
commit | 1bf986bc9c1e823da27465bfd9faf2b725bbcc09 (patch) | |
tree | b47aa7c235ebf2bf958f7906e58a0750a418f0db /setup.c | |
parent | c1324e66d44b7d58915cd7e61c1ea85ed3db6a58 (diff) | |
parent | 11f9dd719104a960d3e2b478477d9055141d1dbc (diff) |
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 'setup.c')
-rw-r--r-- | setup.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -230,14 +230,21 @@ void verify_non_filename(const char *prefix, const char *arg) int get_common_dir(struct strbuf *sb, const char *gitdir) { + const char *git_env_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT); + if (git_env_common_dir) { + strbuf_addstr(sb, git_env_common_dir); + return 1; + } else { + return get_common_dir_noenv(sb, gitdir); + } +} + +int get_common_dir_noenv(struct strbuf *sb, const char *gitdir) +{ struct strbuf data = STRBUF_INIT; struct strbuf path = STRBUF_INIT; - const char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT); int ret = 0; - if (git_common_dir) { - strbuf_addstr(sb, git_common_dir); - return 1; - } + strbuf_addf(&path, "%s/commondir", gitdir); if (file_exists(path.buf)) { if (strbuf_read_file(&data, path.buf, 0) <= 0) |