Our worktree interfaces do not provide a way to look up a worktree by its name. Expose `get_linked_worktree()` to allow for this usecase. As callers are responsible for freeing this worktree, introduce a new function `free_worktree()` that does so. Signed-off-by: Patrick Steinhardt <ps@xxxxxx> --- worktree.c | 25 +++++++++++++++---------- worktree.h | 11 +++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/worktree.c b/worktree.c index a56a6c2a3d..085f2cc41a 100644 --- a/worktree.c +++ b/worktree.c @@ -12,18 +12,23 @@ #include "wt-status.h" #include "config.h" +void free_worktree(struct worktree *worktree) +{ + if (!worktree) + return; + free(worktree->path); + free(worktree->id); + free(worktree->head_ref); + free(worktree->lock_reason); + free(worktree->prune_reason); + free(worktree); +} + void free_worktrees(struct worktree **worktrees) { int i = 0; - - for (i = 0; worktrees[i]; i++) { - free(worktrees[i]->path); - free(worktrees[i]->id); - free(worktrees[i]->head_ref); - free(worktrees[i]->lock_reason); - free(worktrees[i]->prune_reason); - free(worktrees[i]); - } + for (i = 0; worktrees[i]; i++) + free_worktree(worktrees[i]); free (worktrees); } @@ -74,7 +79,7 @@ static struct worktree *get_main_worktree(void) return worktree; } -static struct worktree *get_linked_worktree(const char *id) +struct worktree *get_linked_worktree(const char *id) { struct worktree *worktree = NULL; struct strbuf path = STRBUF_INIT; diff --git a/worktree.h b/worktree.h index ce45b66de9..8a75691eac 100644 --- a/worktree.h +++ b/worktree.h @@ -57,6 +57,12 @@ struct worktree *find_worktree(struct worktree **list, const char *prefix, const char *arg); +/* + * Look up the worktree corresponding to `id`, or NULL of no such worktree + * exists. + */ +struct worktree *get_linked_worktree(const char *id); + /* * Return the worktree corresponding to `path`, or NULL if no such worktree * exists. @@ -134,6 +140,11 @@ void repair_worktrees(worktree_repair_fn, void *cb_data); */ void repair_worktree_at_path(const char *, worktree_repair_fn, void *cb_data); +/* + * Free up the memory for a worktree. + */ +void free_worktree(struct worktree *); + /* * Free up the memory for worktree(s) */ -- 2.43.GIT
Attachment:
signature.asc
Description: PGP signature