proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 23:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

status: Prevent git_status_file() from returning ENOTFOUND when not applicable

Browse Source
This commit is contained in:
nulltoken 2012-05-07 21:21:48 +02:00
parent 464cf248fd
commit 722c08afec
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/status.c
View File

@ -340,17 +340,17 @@ int git_status_file(
assert(status_flags && repo && path); assert(status_flags && repo && path);
if ((workdir = git_repository_workdir(repo)) == NULL) { if ((workdir = git_repository_workdir(repo)) == NULL) {
giterr_set(GITERR_OS, "Cannot get file status from bare repo"); giterr_set(GITERR_INVALID, "Cannot get file status from bare repo");
return GIT_ENOTFOUND; return -1;
} }
if (git_buf_joinpath(&temp_path, workdir, path) < 0) if (git_buf_joinpath(&temp_path, workdir, path) < 0)
return -1; return -1;
if (git_path_isdir(temp_path.ptr)) { if (git_path_isdir(temp_path.ptr)) {
giterr_set(GITERR_OS, "Cannot get file status for directory '%s'", temp_path.ptr); giterr_set(GITERR_INVALID, "Cannot get file status for directory '%s'", temp_path.ptr);
git_buf_free(&temp_path); git_buf_free(&temp_path);
return GIT_ENOTFOUND; return -1;
} }
e = status_entry_new(NULL, path); e = status_entry_new(NULL, path);

16
tests-clar/status/worktree.c
View File

@ -275,6 +275,7 @@ void test_status_worktree__single_folder(void)
error = git_status_file(&status_flags, repo, "subdir"); error = git_status_file(&status_flags, repo, "subdir");
cl_git_fail(error); cl_git_fail(error);
cl_assert(error != GIT_ENOTFOUND);
} }
@ -384,3 +385,18 @@ void test_status_worktree__issue_592_5(void)
git_buf_free(&path); git_buf_free(&path);
} }
void test_status_worktree__cannot_retrieve_the_status_of_a_bare_repository(void)
{
git_repository *repo;
int error, status = 0;
cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
error = git_status_file(&status, repo, "dummy");
cl_git_fail(error);
cl_assert(error != GIT_ENOTFOUND);
git_repository_free(repo);
}