development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

worktree: prepare for more checks of whether path can become worktree

Browse source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2018-08-28 17:20:21 -04:00 committed by Junio C Hamano
parent 602aaed03f
commit 45059e6468
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builtin/worktree.c
View file

@ -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) &&