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

clone: rename static function dir_exists().

Browse Source 
builtin/clone.c has a static function dir_exists() that
checks if a given path exists on the filesystem.  It returns
true (and it is correct for it to return true) when the
given path exists as a non-directory (e.g. a regular file).

This is confusing.  What the caller wants to check, and what
this function wants to return, is if the path exists, so
rename it to path_exists().

Signed-off-by: Miriam Rubio <mirucam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miriam Rubio
2019-10-28 17:55:23 +01:00
committed by Junio C Hamano
parent 5fa0f5238b
commit 6c02042139
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/clone.c
View File

@ -900,7 +900,7 @@ static void dissociate_from_references(void)
free(alternates); free(alternates);
} }
static int dir_exists(const char *path) static int path_exists(const char *path)
{ {
struct stat sb; struct stat sb;
return !stat(path, &sb); return !stat(path, &sb);
@ -982,7 +982,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
dir = guess_dir_name(repo_name, is_bundle, option_bare); dir = guess_dir_name(repo_name, is_bundle, option_bare);
strip_trailing_slashes(dir); strip_trailing_slashes(dir);
dest_exists = dir_exists(dir); dest_exists = path_exists(dir);
if (dest_exists && !is_empty_dir(dir)) if (dest_exists && !is_empty_dir(dir))
die(_("destination path '%s' already exists and is not " die(_("destination path '%s' already exists and is not "
"an empty directory."), dir); "an empty directory."), dir);
@ -993,7 +993,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
work_tree = NULL; work_tree = NULL;
else { else {
work_tree = getenv("GIT_WORK_TREE"); work_tree = getenv("GIT_WORK_TREE");
if (work_tree && dir_exists(work_tree)) if (work_tree && path_exists(work_tree))
die(_("working tree '%s' already exists."), work_tree); die(_("working tree '%s' already exists."), work_tree);
} }
@ -1021,7 +1021,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
} }
if (real_git_dir) { if (real_git_dir) {
if (dir_exists(real_git_dir)) if (path_exists(real_git_dir))
junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL; junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
junk_git_dir = real_git_dir; junk_git_dir = real_git_dir;
} else { } else {