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.h | |
| 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.h')
| -rw-r--r-- | worktree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/worktree.h b/worktree.h index 026ef303e8..d19ec29dbb 100644 --- a/worktree.h +++ b/worktree.h @@ -16,7 +16,7 @@ struct worktree { struct object_id head_oid; int is_detached; int is_bare; - int is_current; + int is_current; /* does `path` match `repo->worktree` */ int lock_reason_valid; /* private */ int prune_reason_valid; /* private */ }; @@ -51,7 +51,6 @@ int submodule_uses_worktrees(const char *path); /* * Return git dir of the worktree. Note that the path may be relative. - * If wt is NULL, git dir of current worktree is returned. */ char *get_worktree_git_dir(const struct worktree *wt); |