git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Duy Nguyen <pclouds@gmail.com>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH 2/9] worktree: move delete_git_dir() earlier in file for upcoming new callers
Date: Tue, 28 Aug 2018 17:20:19 -0400	[thread overview]
Message-ID: <20180828212026.21989-3-sunshine@sunshineco.com> (raw)
In-Reply-To: <20180828212026.21989-1-sunshine@sunshineco.com>

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>
---
 builtin/worktree.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 41e7714396..a8128289cc 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -47,6 +47,20 @@ static int git_worktree_config(const char *var, const char *value, void *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)
 {
 	struct stat st;
@@ -822,20 +836,6 @@ static int delete_git_work_tree(struct worktree *wt)
 	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)
 {
 	int force = 0;
-- 
2.19.0.rc1.350.ge57e33dbd1


  parent reply	other threads:[~2018-08-28 21:20 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-28 21:20 [PATCH 0/9] worktree: fix bugs and broaden --force applicability Eric Sunshine
2018-08-28 21:20 ` [PATCH 1/9] worktree: don't die() in library function find_worktree() Eric Sunshine
2018-08-28 21:20 ` Eric Sunshine [this message]
2018-08-28 21:20 ` [PATCH 3/9] worktree: generalize delete_git_dir() to reduce code duplication Eric Sunshine
2018-08-30  6:57   ` Jeff King
2018-08-30  8:45     ` Eric Sunshine
2018-08-28 21:20 ` [PATCH 4/9] worktree: prepare for more checks of whether path can become worktree Eric Sunshine
2018-08-28 21:20 ` [PATCH 5/9] worktree: disallow adding same path multiple times Eric Sunshine
2018-08-30  7:28   ` Jeff King
2018-08-30  8:22     ` Eric Sunshine
2018-08-28 21:20 ` [PATCH 6/9] worktree: teach 'add' to respect --force for registered but missing path Eric Sunshine
2018-08-30  7:36   ` Jeff King
2018-08-30  8:26     ` Eric Sunshine
2018-08-28 21:20 ` [PATCH 7/9] worktree: teach 'move' to override lock when --force given twice Eric Sunshine
2018-08-30  7:38   ` Jeff King
2018-08-30  8:30     ` Eric Sunshine
2018-08-28 21:20 ` [PATCH 8/9] worktree: teach 'remove' " Eric Sunshine
2018-08-30  7:40   ` Jeff King
2018-08-30  8:33     ` Eric Sunshine
2018-08-28 21:20 ` [PATCH 9/9] worktree: delete .git/worktrees if empty after 'remove' Eric Sunshine
2018-08-30  7:54 ` [PATCH 0/9] worktree: fix bugs and broaden --force applicability Jeff King
2018-08-30  8:57   ` Eric Sunshine
2018-08-30  9:04   ` Eric Sunshine
2018-08-30 19:46     ` Jeff King
2018-08-30 20:14       ` Junio C Hamano
2018-08-30 23:49         ` Ramsay Jones
2018-08-31  0:54           ` Jeff King
2018-08-31 21:57             ` Ramsay Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180828212026.21989-3-sunshine@sunshineco.com \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).