path: refactor repo_git_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 "gitdir" family of functions accordingly. Note that the `repo_git_pathv()` function is converted into an internal implementation detail. It is only used to implement `the_repository` compatibility shims and will eventually be removed from the public interface. 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
70a16ff8a1
commit
bdfc07bfdf
@@ -1315,7 +1315,7 @@ static int repo_has_absorbed_submodules(struct repository *r)
|
||||
int ret;
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
strbuf_repo_git_path(&buf, r, "modules/");
|
||||
repo_git_path_append(r, &buf, "modules/");
|
||||
ret = file_exists(buf.buf) && !is_empty_dir(buf.buf);
|
||||
strbuf_release(&buf);
|
||||
return ret;
|
||||
@@ -2629,6 +2629,6 @@ void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
|
||||
* administrators can explicitly set. Nothing has been decided,
|
||||
* so for now, just append the name at the end of the path.
|
||||
*/
|
||||
strbuf_repo_git_path(buf, r, "modules/");
|
||||
repo_git_path_append(r, buf, "modules/");
|
||||
strbuf_addstr(buf, submodule_name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user