path: root/worktree.c
diff options
authorEric Sunshine <>2020-02-24 09:08:47 (GMT)
committerJunio C Hamano <>2020-02-24 21:04:30 (GMT)
commitbb4995fc3fab35b56f1ca48cda9187bcf340e643 (patch)
treec160a434298ff0fa78f16bb745b3b7ade472d066 /worktree.c
parenta80c4c22147bae6d9f9b907b81ab3f4d129ab690 (diff)
worktree: add utility to find worktree by pathname
find_worktree() employs heuristics to match user provided input -- which may be a pathname or some sort of shorthand -- with an actual worktree. Although this convenience allows a user to identify a worktree with minimal typing, the black-box nature of these heuristics makes it potentially difficult for callers which already know the exact path of a worktree to be confident that the correct worktree will be returned for any specific pathname (particularly a relative one), especially as the heuristics are enhanced and updated. Therefore, add a companion function, find_worktree_by_path(), which deterministically identifies a worktree strictly by pathname with no interpretation and no magic matching. Signed-off-by: Eric Sunshine <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'worktree.c')
1 files changed, 10 insertions, 6 deletions
diff --git a/worktree.c b/worktree.c
index 5b4793c..43c6685 100644
--- a/worktree.c
+++ b/worktree.c
@@ -215,7 +215,6 @@ struct worktree *find_worktree(struct worktree **list,
const char *arg)
struct worktree *wt;
- char *path;
char *to_free = NULL;
if ((wt = find_worktree_by_suffix(list, arg)))
@@ -223,11 +222,17 @@ struct worktree *find_worktree(struct worktree **list,
if (prefix)
arg = to_free = prefix_filename(prefix, arg);
- path = real_pathdup(arg, 0);
- if (!path) {
- free(to_free);
+ wt = find_worktree_by_path(list, arg);
+ free(to_free);
+ return wt;
+struct worktree *find_worktree_by_path(struct worktree **list, const char *p)
+ char *path = real_pathdup(p, 0);
+ if (!path)
return NULL;
- }
for (; *list; list++) {
const char *wt_path = real_path_if_valid((*list)->path);
@@ -235,7 +240,6 @@ struct worktree *find_worktree(struct worktree **list,
- free(to_free);
return *list;