proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-12 10:01:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3185 from libgit2/cmn/foreach-cancel-loose

Browse Source 
path: error out if the callback returns an error
This commit is contained in:
Carlos Martín Nieto 2015-06-07 15:10:28 +02:00
commit b6011e296e
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/path.c
View File

@ -1066,8 +1066,10 @@ int git_path_direach(
git_buf_truncate(path, wd_len); /* restore path */ git_buf_truncate(path, wd_len); /* restore path */
/* Only set our own error if the callback did not set one already */ /* Only set our own error if the callback did not set one already */
if (error != 0 && !giterr_last()) { if (error != 0) {
giterr_set_after_callback(error); if (!giterr_last())
giterr_set_after_callback(error);
break; break;
} }
} }

20
tests/odb/foreach.c
View File

@ -71,15 +71,35 @@ static int foreach_stop_cb(const git_oid *oid, void *data)
return (*nobj == 1000) ? -321 : 0; return (*nobj == 1000) ? -321 : 0;
} }
static int foreach_stop_first_cb(const git_oid *oid, void *data)
{
int *nobj = data;
(*nobj)++;
GIT_UNUSED(oid);
return -123;
}
void test_odb_foreach__interrupt_foreach(void) void test_odb_foreach__interrupt_foreach(void)
{ {
int nobj = 0; int nobj = 0;
git_oid id;
cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git")));
git_repository_odb(&_odb, _repo); git_repository_odb(&_odb, _repo);
cl_assert_equal_i(-321, git_odb_foreach(_odb, foreach_stop_cb, &nobj)); cl_assert_equal_i(-321, git_odb_foreach(_odb, foreach_stop_cb, &nobj));
cl_assert(nobj == 1000); cl_assert(nobj == 1000);
git_odb_free(_odb);
git_repository_free(_repo);
cl_git_pass(git_repository_init(&_repo, "onlyloose.git", true));
git_repository_odb(&_odb, _repo);
cl_git_pass(git_odb_write(&id, _odb, "", 0, GIT_OBJ_BLOB));
cl_assert_equal_i(-123, git_odb_foreach(_odb, foreach_stop_first_cb, &nobj));
} }
void test_odb_foreach__files_in_objects_dir(void) void test_odb_foreach__files_in_objects_dir(void)