diff options
author | Yuang Li <yuangli88@hotmail.com> | 2022-07-29 01:32:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-29 01:32:40 +0100 |
commit | 09acf6986513381316c8797c4529323bff8525a5 (patch) | |
tree | 2802cfbafd3e7d94e6a3153848ed0edf3ac1aebc /tests/libgit2/object/cache.c | |
parent | 3d7a609d632d7a16d099897735f41dae248e943b (diff) | |
parent | 7f46bfac14f0502711f8441348fd361175953fd5 (diff) | |
download | libgit2-09acf6986513381316c8797c4529323bff8525a5.tar.gz |
Merge branch 'mw_dev' into shallow-clone-local
Diffstat (limited to 'tests/libgit2/object/cache.c')
-rw-r--r-- | tests/libgit2/object/cache.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/libgit2/object/cache.c b/tests/libgit2/object/cache.c index 08bf03648..bf8c6fb53 100644 --- a/tests/libgit2/object/cache.c +++ b/tests/libgit2/object/cache.c @@ -91,7 +91,7 @@ void test_object_cache__cache_counts(void) for (i = 0; g_data[i].sha != NULL; ++i) { int count = (int)git_cache_size(&g_repo->objects); - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); /* alternate between loading raw and parsed objects */ if ((i & 1) == 0) { @@ -118,7 +118,7 @@ void test_object_cache__cache_counts(void) for (i = 0; g_data[i].sha != NULL; ++i) { int count = (int)git_cache_size(&g_repo->objects); - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY)); cl_assert(g_data[i].type == git_object_type(obj)); git_object_free(obj); @@ -136,14 +136,14 @@ static void *cache_parsed(void *arg) git_object *obj; for (i = ((int *)arg)[1]; g_data[i].sha != NULL; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY)); cl_assert(g_data[i].type == git_object_type(obj)); git_object_free(obj); } for (i = 0; i < ((int *)arg)[1]; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY)); cl_assert(g_data[i].type == git_object_type(obj)); git_object_free(obj); @@ -162,14 +162,14 @@ static void *cache_raw(void *arg) cl_git_pass(git_repository_odb(&odb, g_repo)); for (i = ((int *)arg)[1]; g_data[i].sha != NULL; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); git_odb_object_free(odb_obj); } for (i = 0; i < ((int *)arg)[1]; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[i].sha, GIT_OID_SHA1)); cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); git_odb_object_free(odb_obj); @@ -234,7 +234,7 @@ static void *cache_quick(void *arg) git_oid oid; git_object *obj; - cl_git_pass(git_oid_fromstr(&oid, g_data[4].sha)); + cl_git_pass(git_oid__fromstr(&oid, g_data[4].sha, GIT_OID_SHA1)); cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY)); cl_assert(g_data[4].type == git_object_type(obj)); git_object_free(obj); |