undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: make high-level pruning re-usable

Browse Source 
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:
Eric Sunshine 2020-06-10 02:30:45 -04:00 committed by Junio C Hamano
parent 1b14d40b38
commit dd9609a12e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/worktree.c
View File

@ -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)