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

Merge branch 'pw/rename-to-get-current-worktree' 

Code clean-up.

* pw/rename-to-get-current-worktree:
  worktree: rename get_worktree_from_repository()
main
Junio C Hamano 2026-05-17 22:58:30 +09:00
parent c26c58de0c 8547908eb3
commit 068c10c741
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);