[PATCH 4/9] worktree: prepare for more checks of whether path can become worktree
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Aug 28, 2018, 21:20 UTC
- Message-ID
- <20180828212026.21989-5-sunshine@sunshineco.com>
- In-Reply-To
- <20180828212026.21989-1-sunshine@sunshineco.com>
Certain conditions must be met for a path to be a valid candidate as the location of a new worktree; for instance, the path must not exist or must be an empty directory. Although the number of conditions is small, new conditions will soon be added so factor out the existing checks into a separate function to avoid further bloating add_worktree().
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- builtin/worktree.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c index 0affcb476c..46c93771e8 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -219,6 +219,12 @@ static const char *worktree_basename(const char *path, int *olen) return name; } +static void validate_worktree_add(const char *path, const struct add_opts *opts) +{ + if (file_exists(path) && !is_empty_dir(path)) + die(_("'%s' already exists"), path); +} + static int add_worktree(const char *path, const char *refname, const struct add_opts *opts) { @@ -233,8 +239,7 @@ static int add_worktree(const char *path, const char *refname, struct commit *commit = NULL; int is_branch = 0; - if (file_exists(path) && !is_empty_dir(path)) - die(_("'%s' already exists"), path); + validate_worktree_add(path, opts); /* is 'refname' a branch or commit? */ if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
-- 2.19.0.rc1.350.ge57e33dbd1