mirror of
https://github.com/git/git.git
synced 2026-06-30 19:58:12 +00:00
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
@@ -644,9 +644,11 @@ static int migrate_file(struct remote *remote)
|
||||
git_config_set_multivar(buf.buf, remote->fetch.items[i].raw, "^$", 0);
|
||||
#ifndef WITH_BREAKING_CHANGES
|
||||
if (remote->origin == REMOTE_REMOTES)
|
||||
unlink_or_warn(git_path("remotes/%s", remote->name));
|
||||
unlink_or_warn(repo_git_path_replace(the_repository, &buf,
|
||||
"remotes/%s", remote->name));
|
||||
else if (remote->origin == REMOTE_BRANCHES)
|
||||
unlink_or_warn(git_path("branches/%s", remote->name));
|
||||
unlink_or_warn(repo_git_path_replace(the_repository, &buf,
|
||||
"branches/%s", remote->name));
|
||||
#endif /* WITH_BREAKING_CHANGES */
|
||||
strbuf_release(&buf);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user