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

worktree: generalize delete_git_dir() to reduce code duplication 

prune_worktrees() and delete_git_dir() both remove worktree
administrative entries from .git/worktrees, and their implementations
are nearly identical. The only difference is that prune_worktrees() is
also capable of removing a bogus non-worktree-related file from
.git/worktrees.

Simplify by extending delete_git_dir() to handle the little bit of
extra functionality needed by prune_worktrees(), and drop the
effectively duplicate code from the latter.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Sunshine 2018-08-28 17:20:20 -04:00 committed by Junio C Hamano
parent e5353bef55
commit 602aaed03f
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/worktree.c
View File

@ -47,16 +47,17 @@ static int git_worktree_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb); return git_default_config(var, value, cb);
} }


static int delete_git_dir(struct worktree *wt) static int delete_git_dir(const char *id)
{ {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
int ret = 0; int ret;


strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id)); strbuf_addstr(&sb, git_common_path("worktrees/%s", id));
if (remove_dir_recursively(&sb, 0)) { ret = remove_dir_recursively(&sb, 0);
if (ret < 0 && errno == ENOTDIR)
ret = unlink(sb.buf);
if (ret)
error_errno(_("failed to delete '%s'"), sb.buf); error_errno(_("failed to delete '%s'"), sb.buf);
ret = -1;
}
strbuf_release(&sb); strbuf_release(&sb);
return ret; return ret;
} }
@ -130,10 +131,8 @@ static int prune_worktree(const char *id, struct strbuf *reason)
static void prune_worktrees(void) static void prune_worktrees(void)
{ {
struct strbuf reason = STRBUF_INIT; struct strbuf reason = STRBUF_INIT;
struct strbuf path = STRBUF_INIT;
DIR *dir = opendir(git_path("worktrees")); DIR *dir = opendir(git_path("worktrees"));
struct dirent *d; struct dirent *d;
int ret;
if (!dir) if (!dir)
return; return;
while ((d = readdir(dir)) != NULL) { while ((d = readdir(dir)) != NULL) {
@ -146,18 +145,12 @@ static void prune_worktrees(void)
printf("%s\n", reason.buf); printf("%s\n", reason.buf);
if (show_only) if (show_only)
continue; continue;
git_path_buf(&path, "worktrees/%s", d->d_name); delete_git_dir(d->d_name);
ret = remove_dir_recursively(&path, 0);
if (ret < 0 && errno == ENOTDIR)
ret = unlink(path.buf);
if (ret)
error_errno(_("failed to remove '%s'"), path.buf);
} }
closedir(dir); closedir(dir);
if (!show_only) if (!show_only)
rmdir(git_path("worktrees")); rmdir(git_path("worktrees"));
strbuf_release(&reason); strbuf_release(&reason);
strbuf_release(&path);
} }


static int prune(int ac, const char **av, const char *prefix) static int prune(int ac, const char **av, const char *prefix)
@ -882,7 +875,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
* continue on even if ret is non-zero, there's no going back * continue on even if ret is non-zero, there's no going back
* from here. * from here.
*/ */
ret |= delete_git_dir(wt); ret |= delete_git_dir(wt->id);


free_worktrees(worktrees); free_worktrees(worktrees);
return ret; return ret;