undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mr/clone-dir-exists-to-path-exists'

Browse Source 
Code cleanup.

* mr/clone-dir-exists-to-path-exists:
  clone: rename static function `dir_exists()`.
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:29 -08:00
commit dfc03e48ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/clone.c
View File

@ -899,7 +899,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);
@ -981,7 +981,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);
@ -992,7 +992,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);
} }
@ -1020,7 +1020,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 {