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 0f779147602 (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>
Phillip Wood committed
May 1, 2026 at 16:20 UTC
8547908eb30d8b3ee074081f89fa29c6d6d077c2
3 files changed
+3
-3
worktree.c
+1
-1
index d874e23b4e..340b4ed777 100644
--- a/worktree.c
+++ b/worktree.c
@@ -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);
worktree.h
+1
-1
index d19ec29dbb..1075409f9a 100644
--- a/worktree.h
+++ b/worktree.h
@@ -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.
wt-status.c
+1
-1
index 479ccc3304..c12fca7078 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -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);