mirror of
https://github.com/git/git.git
synced 2024-09-28 07:40:44 +02:00
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>
This commit is contained in:
parent
1b14d40b38
commit
dd9609a12e
@ -133,6 +133,14 @@ static int should_prune_worktree(const char *id, struct strbuf *reason)
|
|||||||
return 0;
|
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)
|
static void prune_worktrees(void)
|
||||||
{
|
{
|
||||||
struct strbuf reason = STRBUF_INIT;
|
struct strbuf reason = STRBUF_INIT;
|
||||||
@ -146,12 +154,7 @@ static void prune_worktrees(void)
|
|||||||
strbuf_reset(&reason);
|
strbuf_reset(&reason);
|
||||||
if (!should_prune_worktree(d->d_name, &reason))
|
if (!should_prune_worktree(d->d_name, &reason))
|
||||||
continue;
|
continue;
|
||||||
if (show_only || verbose)
|
prune_worktree(d->d_name, reason.buf);
|
||||||
printf_ln(_("Removing %s/%s: %s"),
|
|
||||||
"worktrees", d->d_name, reason.buf);
|
|
||||||
if (show_only)
|
|
||||||
continue;
|
|
||||||
delete_git_dir(d->d_name);
|
|
||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
if (!show_only)
|
if (!show_only)
|
||||||
|
Loading…
Reference in New Issue
Block a user