Commit 68353144 authored by Duy Nguyen's avatar Duy Nguyen Committed by Junio C Hamano

worktree.c: add find_worktree()

So far we haven't needed to identify an existing worktree from command
line. Future commands such as lock or move will need it. The current
implementation identifies worktrees by path (*). In future, the function
could learn to identify by $(basename $path) or tags...

(*) We could probably go cheaper with comparing inode number (and
probably more reliable than paths when unicode enters the game). But not
all systems have good inode that so let's stick to something simple for
Helped-by: Eric Sunshine's avatarEric Sunshine <>
Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <>
Signed-off-by: 's avatarJunio C Hamano <>
parent 0409e0b6
......@@ -214,6 +214,21 @@ const char *get_worktree_git_dir(const struct worktree *wt)
return git_common_path("worktrees/%s", wt->id);
struct worktree *find_worktree(struct worktree **list,
const char *prefix,
const char *arg)
char *path;
arg = prefix_filename(prefix, strlen(prefix), arg);
path = xstrdup(real_path(arg));
for (; *list; list++)
if (!fspathcmp(path, real_path((*list)->path)))
return *list;
int is_worktree_being_rebased(const struct worktree *wt,
const char *target)
......@@ -29,6 +29,14 @@ extern struct worktree **get_worktrees(void);
extern const char *get_worktree_git_dir(const struct worktree *wt);
* Search a worktree that can be unambiguously identified by
* "arg". "prefix" must not be NULL.
extern struct worktree *find_worktree(struct worktree **list,
const char *prefix,
const char *arg);
* Free up the memory for worktree(s)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment