Re: [PATCH 4/8] worktree: make high-level pruning re-usable
From: Junio C Hamano <hidden>
Date: 2020-06-08 21:29:53
Eric Sunshine [off-list ref] writes:
quoted hunk
The low-level logic for removing a worktree is well encapsulated in delete_git_dir(). However, high-level details related to pruning a worktree -- such as dealing with verbosity and dry-run mode -- are not encapsulated. Factor out this high-level logic into its own function so it can be re-used as new worktree corruption detectors are added. Signed-off-by: Eric Sunshine <redacted> --- builtin/worktree.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)diff --git a/builtin/worktree.c b/builtin/worktree.c index 27681a1396..d0c046e885 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c@@ -133,6 +133,14 @@ static int should_prune_worktree(const char *id, struct strbuf *reason) return 0; } +static void prune_worktree(const char *id, const char *reason) +{ + if (show_only || verbose) + printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason); + if (!show_only) + delete_git_dir(id); +}
Makes sense, and this sensible name can be used only because we've cleaned up the other one in the previous step. Good so far (except that I still do not know why 2/8 is a good move after reading the series up to this point).
quoted hunk
static void prune_worktrees(void) { struct strbuf reason = STRBUF_INIT;@@ -146,12 +154,7 @@ static void prune_worktrees(void) strbuf_reset(&reason); if (!should_prune_worktree(d->d_name, &reason)) continue; - if (show_only || verbose) - printf_ln(_("Removing %s/%s: %s"), - "worktrees", d->d_name, reason.buf); - if (show_only) - continue; - delete_git_dir(d->d_name); + prune_worktree(d->d_name, reason.buf); } closedir(dir); if (!show_only)