path: refactor repo_submodule_path() family of functions
As explained in an earlier commit, we're refactoring path-related functions to provide a consistent interface for computing paths into the commondir, gitdir and worktree. Refactor the "submodule" family of functions accordingly. Note that in contrast to the other `repo_*_path()` families, we have to pass in the repository as a non-constant pointer. This is because we end up calling `repo_read_gitmodules()` deep down in the callstack, which may end up modifying the repository. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
f9467895d8
commit
f5c714e2a7
@@ -487,7 +487,8 @@ int submodule_uses_worktrees(const char *path)
|
||||
int ret = 0;
|
||||
struct repository_format format = REPOSITORY_FORMAT_INIT;
|
||||
|
||||
submodule_gitdir = git_pathdup_submodule(path, "%s", "");
|
||||
submodule_gitdir = repo_submodule_path(the_repository,
|
||||
path, "%s", "");
|
||||
if (!submodule_gitdir)
|
||||
return 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user