path: stop relying on the_repository in worktree_git_path()
When not provided a worktree, then `worktree_git_path()` will fall back to returning a path relative to the main repository. In this case, we implicitly rely on `the_repository` to derive the path. Remove this dependency by passing a `struct repository` as parameter. 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
78f2210b3c
commit
a973f60dc7
9
path.c
9
path.c
@ -512,12 +512,17 @@ const char *mkpath(const char *fmt, ...)
|
||||
return cleanup_path(pathname->buf);
|
||||
}
|
||||
|
||||
const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)
|
||||
const char *worktree_git_path(struct repository *r,
|
||||
const struct worktree *wt, const char *fmt, ...)
|
||||
{
|
||||
struct strbuf *pathname = get_pathname();
|
||||
va_list args;
|
||||
|
||||
if (wt && wt->repo != r)
|
||||
BUG("worktree not connected to expected repository");
|
||||
|
||||
va_start(args, fmt);
|
||||
repo_git_pathv(the_repository, wt, pathname, fmt, args);
|
||||
repo_git_pathv(r, wt, pathname, fmt, args);
|
||||
va_end(args);
|
||||
return pathname->buf;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user