kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

worktree: rename get_worktree_from_repository() 

get_worktree_from_repository() returns a struct worktree that
describes the worktree that the repository argument would operate
on. Since 0f77914760 (worktree: remove "the_repository" from
is_current_worktree(), 2026-03-26) that worktree is always the
"current" worktree. Change the name to get_current_worktee() to
reflect better what the function does.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Phillip Wood 2026-05-01 16:20:00 +01:00 committed by Junio C Hamano
parent 94f057755b
commit 8547908eb3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worktree.c
View File

@ -66,7 +66,7 @@ static int is_current_worktree(struct worktree *wt)
return is_current;
}

struct worktree *get_worktree_from_repository(struct repository *repo)
struct worktree *get_current_worktree(struct repository *repo)
{
struct worktree *wt = xcalloc(1, sizeof(*wt));
char *gitdir = absolute_pathdup(repo->gitdir);

2
worktree.h
View File

@ -42,7 +42,7 @@ struct worktree **get_worktrees_without_reading_head(void);
* Construct a struct worktree corresponding to repo->gitdir and
* repo->worktree.
*/
struct worktree *get_worktree_from_repository(struct repository *repo);
struct worktree *get_current_worktree(struct repository *repo);

/*
* Returns 1 if linked worktrees exist, 0 otherwise.

2
wt-status.c
View File

@ -1827,7 +1827,7 @@ void wt_status_get_state(struct repository *r,
struct stat st;
struct object_id oid;
enum replay_action action;
struct worktree *wt = get_worktree_from_repository(r);
struct worktree *wt = get_current_worktree(r);

if (!stat(git_path_merge_head(r), &st)) {
wt_status_check_rebase(wt, state);