mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

path: always pass in commondir to update_common_dir

Browse Source 
Instead of passing in 'NULL' and having 'update_common_dir()' query for
the commondir, have the callers of 'update_common_dir()' be responsible
for providing the commondir.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-06-22 11:43:36 -07:00
committed by Junio C Hamano
parent e7d72d0753
commit 7aee36013a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
path.c
View File

@ -345,8 +345,6 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len,
{ {
char *base = buf->buf + git_dir_len; char *base = buf->buf + git_dir_len;
init_common_trie(); init_common_trie();
if (!common_dir)
common_dir = get_git_common_dir();
if (trie_find(&common_trie, base, check_common, NULL) > 0) if (trie_find(&common_trie, base, check_common, NULL) > 0)
replace_dir(buf, git_dir_len, common_dir); replace_dir(buf, git_dir_len, common_dir);
} }
@ -387,7 +385,7 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
else if (git_hooks_path && dir_prefix(base, "hooks")) else if (git_hooks_path && dir_prefix(base, "hooks"))
replace_dir(buf, git_dir_len + 5, git_hooks_path); replace_dir(buf, git_dir_len + 5, git_hooks_path);
else if (the_repository->different_commondir) else if (the_repository->different_commondir)
update_common_dir(buf, git_dir_len, NULL); update_common_dir(buf, git_dir_len, get_git_common_dir());
} }
static void do_git_path(const struct worktree *wt, struct strbuf *buf, static void do_git_path(const struct worktree *wt, struct strbuf *buf,