Peter Jones <> writes:

Same comment on the commit title as 1/4; also, we tend not to upcase
the first word after the <area>: word and omit the full-stop on the
title (see "git shortlog -32 --no-merges" on our project for

> Add delete_worktrees_dir_if_empty() and prune_worktree() to the public
> API, so they can be used from more places.  Also add a new function,
> prune_worktree_if_missing(), which prunes unlocked worktrees if they
> aren't present on the filesystem.

It probably is cleaner to do the "also" part as a separate step, as
that allows readers to skip this step without reading it deeply, but
let's see how it is done.

> @@ -144,7 +73,7 @@ static void prune_worktrees(void)
>               if (is_dot_or_dotdot(d->d_name))
>                       continue;
>               strbuf_reset(&reason);
> -             if (!prune_worktree(d->d_name, &reason))
> +             if (!prune_worktree(d->d_name, &reason, expire))
>                       continue;
>               if (show_only || verbose)
>                       printf("%s\n", reason.buf);
> diff --git a/worktree.c b/worktree.c
> index 4924805c389..08454a4e65d 100644
> --- a/worktree.c
> +++ b/worktree.c
> @@ -608,3 +608,91 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
> +int prune_worktree(const char *id, struct strbuf *reason, timestamp_t expire)

This is not a mere code movement, because the original relied on the
file-scope static "expire", and the public version wants to give
callers control over the expiration value.  That is a good change
that deserves to be advertised and explained in the proposed log

> +int prune_worktree_if_missing(const struct worktree *wt)
> +{
> +     struct strbuf reason = STRBUF_INIT;
> +     int ret;
> +
> +     if (is_worktree_locked(wt) ||
> +         access(wt->path, F_OK) >= 0 ||
> +         (errno != ENOENT && errno == ENOTDIR)) {
> +             errno = EEXIST;
> +             return -1;
> +     }

When access() failed but not because the named path did not exist
(i.e. the directory may still exist---it is just this invocation of
the process happened to fail to see it---or it may not exist but we
cannot see far enough to notice that it does not exist) then we play
safe, assume it does exist, and refrain from calling prune_worktree()
on it.  Which makes sense, but do we need to set errno to EEXIST
here?  Does prune_worktree() ensure the value left in errno when it
returns failure in a similar way to allow the caller of this new
helper make effective and reliable use of errno?

> +     strbuf_addf(&reason, _("Removing worktrees/%s: worktree directory is 
> not present"), wt->id);
> +     ret = prune_worktree(wt->id, &reason, TIME_MAX);
> +     return ret;
> +}

Reply via email to