worktree: make high-level pruning re-usable

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 <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 0402f244ea9ebd27278a680528720f9a8f93342d..9284e490b9768baee6e043f5ff7253a4643942de 100644 (file)
--- 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);
+}
+
 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)