mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: move delete_git_dir() earlier in file for upcoming new callers

Browse Source 
This is a pure code movement to avoid having to forward-declare the
function when new callers are subsequently 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
2018-08-28 17:20:19 -04:00
committed by Junio C Hamano
parent 4c5fa9e6c4
commit e5353bef55
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/worktree.c
View File

@ -47,6 +47,20 @@ 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)
{
struct strbuf sb = STRBUF_INIT;
int ret = 0;
strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
if (remove_dir_recursively(&sb, 0)) {
error_errno(_("failed to delete '%s'"), sb.buf);
ret = -1;
}
strbuf_release(&sb);
return ret;
}
static int prune_worktree(const char *id, struct strbuf *reason) static int prune_worktree(const char *id, struct strbuf *reason)
{ {
struct stat st; struct stat st;
@ -822,20 +836,6 @@ static int delete_git_work_tree(struct worktree *wt)
return ret; return ret;
} }
static int delete_git_dir(struct worktree *wt)
{
struct strbuf sb = STRBUF_INIT;
int ret = 0;
strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
if (remove_dir_recursively(&sb, 0)) {
error_errno(_("failed to delete '%s'"), sb.buf);
ret = -1;
}
strbuf_release(&sb);
return ret;
}
static int remove_worktree(int ac, const char **av, const char *prefix) static int remove_worktree(int ac, const char **av, const char *prefix)
{ {
int force = 0; int force = 0;