diff options
Diffstat (limited to 'src/repository.c')
| -rw-r--r-- | src/repository.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/repository.c b/src/repository.c index 67bfcc916..97d70c437 100644 --- a/src/repository.c +++ b/src/repository.c @@ -79,14 +79,14 @@ void git_repository_free(git_repository *repo) static int quickcheck_repository_dir(git_buf *repository_path) { /* Check OBJECTS_DIR first, since it will generate the longest path name */ - if (git_futils_contains_dir(repository_path, GIT_OBJECTS_DIR, 0) < 0) + if (git_path_contains_dir(repository_path, GIT_OBJECTS_DIR, 0) < 0) return GIT_ERROR; /* Ensure HEAD file exists */ - if (git_futils_contains_file(repository_path, GIT_HEAD_FILE, 0) < 0) + if (git_path_contains_file(repository_path, GIT_HEAD_FILE, 0) < 0) return GIT_ERROR; - if (git_futils_contains_dir(repository_path, GIT_REFS_DIR, 0) < 0) + if (git_path_contains_dir(repository_path, GIT_REFS_DIR, 0) < 0) return GIT_ERROR; return GIT_SUCCESS; @@ -164,7 +164,7 @@ int git_repository_open(git_repository **repo_out, const char *path) * of the working dir, by testing if it contains a `.git` * folder inside of it. */ - git_futils_contains_dir(&path_buf, DOT_GIT, 1); /* append on success */ + git_path_contains_dir(&path_buf, DOT_GIT, 1); /* append on success */ /* ignore error, since it just means `path/.git` doesn't exist */ if (quickcheck_repository_dir(&path_buf) < GIT_SUCCESS) { @@ -491,7 +491,7 @@ static int read_gitfile(git_buf *path_out, const char *file_path, const char *ba git_futils_freebuffer(&file); - if (error == GIT_SUCCESS && git_futils_exists(path_out->ptr) == 0) + if (error == GIT_SUCCESS && git_path_exists(path_out->ptr) == 0) return GIT_SUCCESS; return git__throw(GIT_EOBJCORRUPTED, "The `.git` file points to a nonexistent path"); @@ -535,7 +535,7 @@ int git_repository_discover( * If the `.git` file is regular instead of * a directory, it should contain the path of the actual git repository */ - if (git_futils_isfile(normal_path.ptr) == GIT_SUCCESS) { + if (git_path_isfile(normal_path.ptr) == GIT_SUCCESS) { git_buf gitfile_path = GIT_BUF_INIT; error = read_gitfile(&gitfile_path, normal_path.ptr, bare_path.ptr); @@ -557,7 +557,7 @@ int git_repository_discover( /** * If the `.git` file is a folder, we check inside of it */ - if (git_futils_isdir(normal_path.ptr) == GIT_SUCCESS) { + if (git_path_isdir(normal_path.ptr) == GIT_SUCCESS) { error = quickcheck_repository_dir(&normal_path); if (error == GIT_SUCCESS) { found_path = &normal_path; @@ -733,7 +733,7 @@ int git_repository_init(git_repository **repo_out, const char *path, unsigned is if (error < GIT_SUCCESS) return error; - if (git_futils_isdir(repository_path.ptr) == GIT_SUCCESS) { + if (git_path_isdir(repository_path.ptr) == GIT_SUCCESS) { if (quickcheck_repository_dir(&repository_path) == GIT_SUCCESS) { error = repo_init_reinit(repository_path.ptr, is_bare); git_buf_free(&repository_path); |