worktree: move delete_git_dir() earlier in file for upcoming new callers
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>
Eric Sunshine committed
Aug 28, 2018 at 17:20 UTC
e5353bef550d91655b3f8fb443a26c0ba209153f
1 file changed
+14
-14
builtin/worktree.c
+14
-14
@@ -47,6 +47,20 @@ static int git_worktree_config(const char *var, const char *value, void *cb)
47
return git_default_config(var, value, cb);
48
}
49
50
+static int delete_git_dir(struct worktree *wt)
51
+{
52
+ struct strbuf sb = STRBUF_INIT;
53
+ int ret = 0;
54
+
55
+ strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
56
+ if (remove_dir_recursively(&sb, 0)) {
57
+ error_errno(_("failed to delete '%s'"), sb.buf);
58
+ ret = -1;
59
+ }
60
+ strbuf_release(&sb);
61
+ return ret;
62
+}
63
+
64
static int prune_worktree(const char *id, struct strbuf *reason)
65
{
66
struct stat st;
@@ -822,20 +836,6 @@ static int delete_git_work_tree(struct worktree *wt)
836
return ret;
837
}
838
825
-static int delete_git_dir(struct worktree *wt)
826
-{
827
- struct strbuf sb = STRBUF_INIT;
828
- int ret = 0;
829
-
830
- strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
831
- if (remove_dir_recursively(&sb, 0)) {
832
- error_errno(_("failed to delete '%s'"), sb.buf);
833
- ret = -1;
834
- }
835
- strbuf_release(&sb);
836
- return ret;
837
-}
838
-
839
static int remove_worktree(int ac, const char **av, const char *prefix)
840
{
841
int force = 0;