kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

worktree: give "should be pruned?" function more meaningful name 

Readers of the name prune_worktree() are likely to expect the function
to actually prune a worktree, however, it only answers the question
"should this worktree be pruned?". Give it a name more reflective of its
true purpose to avoid such confusion.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Sunshine 2020-06-10 02:30:44 -04:00 committed by Junio C Hamano
parent c9b77f2cea
commit 1b14d40b38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/worktree.c
View File

@ -67,7 +67,7 @@ static void delete_worktrees_dir_if_empty(void)
rmdir(git_path("worktrees")); /* ignore failed removal */ rmdir(git_path("worktrees")); /* ignore failed removal */
} }


static int prune_worktree(const char *id, struct strbuf *reason) static int should_prune_worktree(const char *id, struct strbuf *reason)
{ {
struct stat st; struct stat st;
char *path; char *path;
@ -144,7 +144,7 @@ static void prune_worktrees(void)
if (is_dot_or_dotdot(d->d_name)) if (is_dot_or_dotdot(d->d_name))
continue; continue;
strbuf_reset(&reason); strbuf_reset(&reason);
if (!prune_worktree(d->d_name, &reason)) if (!should_prune_worktree(d->d_name, &reason))
continue; continue;
if (show_only || verbose) if (show_only || verbose)
printf_ln(_("Removing %s/%s: %s"), printf_ln(_("Removing %s/%s: %s"),