diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2026-04-04 11:53:49 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2026-04-04 11:57:24 +0800 |
| commit | fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d (patch) | |
| tree | baec3af2039bd59c01e049f3bd9e10e233d44a1d /worktree.c | |
| parent | 82747b07cc0f7d6fd8237633c1eb533050efba3d (diff) | |
| parent | 8de2f1b07a8053d7f1aad70dc1131d6afcf5a28a (diff) | |
| download | git-fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d.tar.gz git-fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d.zip | |
Merge branch 'master' of https://github.com/git/git
Upstream adds 18 new translatable messages.
* 'master' of https://github.com/git/git: (41 commits)
A bit more on top of 2.54-rc0
...
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/worktree.c b/worktree.c index 56732f8f33..d874e23b4e 100644 --- a/worktree.c +++ b/worktree.c @@ -58,7 +58,7 @@ static void add_head_info(struct worktree *wt) static int is_current_worktree(struct worktree *wt) { - char *git_dir = absolute_pathdup(repo_get_git_dir(the_repository)); + char *git_dir = absolute_pathdup(repo_get_git_dir(wt->repo)); char *wt_git_dir = get_worktree_git_dir(wt); int is_current = !fspathcmp(git_dir, absolute_path(wt_git_dir)); free(wt_git_dir); @@ -78,7 +78,7 @@ struct worktree *get_worktree_from_repository(struct repository *repo) wt->is_bare = !repo->worktree; if (fspathcmp(gitdir, commondir)) wt->id = xstrdup(find_last_dir_sep(gitdir) + 1); - wt->is_current = is_current_worktree(wt); + wt->is_current = true; add_head_info(wt); free(gitdir); @@ -227,11 +227,11 @@ struct worktree **get_worktrees_without_reading_head(void) char *get_worktree_git_dir(const struct worktree *wt) { if (!wt) - return xstrdup(repo_get_git_dir(the_repository)); + BUG("%s() called with NULL worktree", __func__); else if (!wt->id) - return xstrdup(repo_get_common_dir(the_repository)); + return xstrdup(repo_get_common_dir(wt->repo)); else - return repo_common_path(the_repository, "worktrees/%s", wt->id); + return repo_common_path(wt->repo, "worktrees/%s", wt->id); } static struct worktree *find_worktree_by_suffix(struct worktree **list, |