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
@ -1872,7 +1872,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
|
||||
continue; /* current index already taken care of */
|
||||
|
||||
if (read_index_from(&istate,
|
||||
worktree_git_path(wt, "index"),
|
||||
worktree_git_path(the_repository, wt, "index"),
|
||||
get_worktree_git_dir(wt)) > 0)
|
||||
do_add_index_objects_to_pending(revs, &istate, flags);
|
||||
discard_index(&istate);
|
||||
|
Reference in New Issue
Block a user