path: drop git_path()
in favor of repo_git_path()
Remove `git_path()` in favor of the `repo_git_path()` family of functions, which makes the implicit dependency on `the_repository` go away. Note that `git_path()` returned a string allocated via `get_pathname()`, which uses a rotating set of statically allocated buffers. Consequently, callers didn't have to free the returned string. The same isn't true for `repo_common_path()`, so we also have to add logic to free the returned strings. This refactoring also allows us to remove `repo_common_pathv()` as well as `get_pathname()` 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
8ee018d863
commit
88dd321cfe
@ -789,8 +789,8 @@ int cmd_rev_parse(int argc,
|
||||
if (!strcmp(arg, "--git-path")) {
|
||||
if (!argv[i + 1])
|
||||
die(_("--git-path requires an argument"));
|
||||
strbuf_reset(&buf);
|
||||
print_path(git_path("%s", argv[i + 1]), prefix,
|
||||
print_path(repo_git_path_replace(the_repository, &buf,
|
||||
"%s", argv[i + 1]), prefix,
|
||||
format,
|
||||
DEFAULT_RELATIVE_IF_SHARED);
|
||||
i++;
|
||||
@ -1083,7 +1083,7 @@ int cmd_rev_parse(int argc,
|
||||
die(_("Could not read the index"));
|
||||
if (the_repository->index->split_index) {
|
||||
const struct object_id *oid = &the_repository->index->split_index->base_oid;
|
||||
const char *path = git_path("sharedindex.%s", oid_to_hex(oid));
|
||||
const char *path = repo_git_path_replace(the_repository, &buf, "sharedindex.%s", oid_to_hex(oid));
|
||||
print_path(path, prefix, format, DEFAULT_RELATIVE);
|
||||
}
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user