sha256: indirection for experimental functions

The experimental function signature is only available when
`GIT_EXPERIMENTAL_SHA256` is enabled.

17 files changed, 85 insertions, 83 deletions

diff --git a/tests/libgit2/odb/alternates.c b/tests/libgit2/odb/alternates.c
index 0e14e1d8f..4d2da6b1f 100644
--- a/tests/libgit2/odb/alternates.c
+++ b/tests/libgit2/odb/alternates.c
@@ -52,7 +52,7 @@ void test_odb_alternates__chained(void)
 
 	/* Now load B and see if we can find an object from testrepo.git */
 	cl_git_pass(git_repository_open(&repo, paths[1]));
-	git_oid_fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1);
+	git_oid__fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1);
 	cl_git_pass(git_commit_lookup(&commit, repo, &oid));
 	git_commit_free(commit);
 	git_repository_free(repo);
@@ -74,7 +74,7 @@ void test_odb_alternates__long_chain(void)
 
 	/* Now load the last one and see if we can find an object from testrepo.git */
 	cl_git_pass(git_repository_open(&repo, paths[ARRAY_SIZE(paths)-1]));
-	git_oid_fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1);
+	git_oid__fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1);
 	cl_git_fail(git_commit_lookup(&commit, repo, &oid));
 	git_repository_free(repo);
 }
diff --git a/tests/libgit2/odb/backend/backend_helpers.c b/tests/libgit2/odb/backend/backend_helpers.c
index 337c11cf6..c1a0070d6 100644
--- a/tests/libgit2/odb/backend/backend_helpers.c
+++ b/tests/libgit2/odb/backend/backend_helpers.c
@@ -9,7 +9,7 @@ static int search_object(const fake_object **out, fake_backend *fake, const git_
 	while (obj && obj->oid) {
 		git_oid current_oid;
 
-		git_oid_fromstr(&current_oid, obj->oid, GIT_OID_SHA1);
+		git_oid__fromstr(&current_oid, obj->oid, GIT_OID_SHA1);
 
 		if (git_oid_ncmp(&current_oid, oid, len) == 0) {
 			if (found)
@@ -52,7 +52,7 @@ static int fake_backend__exists_prefix(
 		return error;
 
 	if (out)
-		git_oid_fromstr(out, obj->oid, GIT_OID_SHA1);
+		git_oid__fromstr(out, obj->oid, GIT_OID_SHA1);
 
 	return 0;
 }
@@ -115,7 +115,7 @@ static int fake_backend__read_prefix(
 	if ((error = search_object(&obj, fake, short_oid, len)) < 0)
 		return error;
 
-	git_oid_fromstr(out_oid, obj->oid, GIT_OID_SHA1);
+	git_oid__fromstr(out_oid, obj->oid, GIT_OID_SHA1);
 	*len_p = strlen(obj->content);
 	*buffer_p = git__strdup(obj->content);
 	*type_p = GIT_OBJECT_BLOB;
diff --git a/tests/libgit2/odb/backend/mempack.c b/tests/libgit2/odb/backend/mempack.c
index e86c9b787..eb8ab3cb0 100644
--- a/tests/libgit2/odb/backend/mempack.c
+++ b/tests/libgit2/odb/backend/mempack.c
@@ -1,5 +1,6 @@
 #include "clar_libgit2.h"
 #include "repository.h"
+#include "odb.h"
 #include "backend_helpers.h"
 #include "git2/sys/mempack.h"
 
@@ -13,7 +14,7 @@ void test_odb_backend_mempack__initialize(void)
 	git_odb_backend *backend;
 
 	cl_git_pass(git_mempack_new(&backend));
-	cl_git_pass(git_odb_new(&_odb, NULL));
+	cl_git_pass(git_odb__new(&_odb, NULL));
 	cl_git_pass(git_odb_add_backend(_odb, backend, 10));
 	cl_git_pass(git_repository_wrap_odb(&_repo, _odb));
 }
@@ -34,13 +35,13 @@ void test_odb_backend_mempack__write_succeeds(void)
 
 void test_odb_backend_mempack__read_of_missing_object_fails(void)
 {
-	cl_git_pass(git_oid_fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
 	cl_git_fail_with(GIT_ENOTFOUND, git_odb_read(&_obj, _odb, &_oid));
 }
 
 void test_odb_backend_mempack__exists_of_missing_object_fails(void)
 {
-	cl_git_pass(git_oid_fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
 	cl_assert(git_odb_exists(_odb, &_oid) == 0);
 }
 
diff --git a/tests/libgit2/odb/backend/multiple.c b/tests/libgit2/odb/backend/multiple.c
index ee751aeb3..97588164d 100644
--- a/tests/libgit2/odb/backend/multiple.c
+++ b/tests/libgit2/odb/backend/multiple.c
@@ -24,7 +24,7 @@ void test_odb_backend_multiple__initialize(void)
 {
 	git_odb_backend *backend;
 
-	git_oid_fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
+	git_oid__fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
 
 	_obj = NULL;
 	_repo = cl_git_sandbox_init("testrepo.git");
diff --git a/tests/libgit2/odb/backend/nobackend.c b/tests/libgit2/odb/backend/nobackend.c
index 2812a5ae0..7d9394c6f 100644
--- a/tests/libgit2/odb/backend/nobackend.c
+++ b/tests/libgit2/odb/backend/nobackend.c
@@ -1,5 +1,6 @@
 #include "clar_libgit2.h"
 #include "repository.h"
+#include "odb.h"
 #include "git2/sys/repository.h"
 
 static git_repository *_repo;
@@ -12,7 +13,7 @@ void test_odb_backend_nobackend__initialize(void)
 
 	cl_git_pass(git_repository_new(&_repo));
 	cl_git_pass(git_config_new(&config));
-	cl_git_pass(git_odb_new(&odb, NULL));
+	cl_git_pass(git_odb__new(&odb, NULL));
 	cl_git_pass(git_refdb_new(&refdb, _repo));
 
 	git_repository_set_config(_repo, config);
diff --git a/tests/libgit2/odb/backend/nonrefreshing.c b/tests/libgit2/odb/backend/nonrefreshing.c
index 5fb7a4d81..5084eb7f7 100644
--- a/tests/libgit2/odb/backend/nonrefreshing.c
+++ b/tests/libgit2/odb/backend/nonrefreshing.c
@@ -33,8 +33,8 @@ static void setup_repository_and_backend(void)
 
 void test_odb_backend_nonrefreshing__initialize(void)
 {
-	git_oid_fromstr(&_nonexisting_oid, NONEXISTING_HASH, GIT_OID_SHA1);
-	git_oid_fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
+	git_oid__fromstr(&_nonexisting_oid, NONEXISTING_HASH, GIT_OID_SHA1);
+	git_oid__fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
 	setup_repository_and_backend();
 }
 
diff --git a/tests/libgit2/odb/backend/refreshing.c b/tests/libgit2/odb/backend/refreshing.c
index 39c55c267..fcba748ee 100644
--- a/tests/libgit2/odb/backend/refreshing.c
+++ b/tests/libgit2/odb/backend/refreshing.c
@@ -33,8 +33,8 @@ static void setup_repository_and_backend(void)
 
 void test_odb_backend_refreshing__initialize(void)
 {
-	git_oid_fromstr(&_nonexisting_oid, NONEXISTING_HASH, GIT_OID_SHA1);
-	git_oid_fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
+	git_oid__fromstr(&_nonexisting_oid, NONEXISTING_HASH, GIT_OID_SHA1);
+	git_oid__fromstr(&_existing_oid, EXISTING_HASH, GIT_OID_SHA1);
 	setup_repository_and_backend();
 }
 
diff --git a/tests/libgit2/odb/backend/simple.c b/tests/libgit2/odb/backend/simple.c
index c6545f301..25dfd90a2 100644
--- a/tests/libgit2/odb/backend/simple.c
+++ b/tests/libgit2/odb/backend/simple.c
@@ -49,7 +49,7 @@ void test_odb_backend_simple__read_of_object_succeeds(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_pass(git_odb_read(&_obj, _odb, &_oid));
 
 	assert_object_contains(_obj, objs[0].content);
@@ -64,7 +64,7 @@ void test_odb_backend_simple__read_of_nonexisting_object_fails(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
 	cl_git_fail_with(GIT_ENOTFOUND, git_odb_read(&_obj, _odb, &_oid));
 }
 
@@ -77,7 +77,7 @@ void test_odb_backend_simple__read_with_hash_mismatch_fails(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_fail_with(GIT_EMISMATCH, git_odb_read(&_obj, _odb, &_oid));
 }
 
@@ -89,7 +89,7 @@ void test_odb_backend_simple__read_with_hash_mismatch_succeeds_without_verificat
 	};
 
 	setup_backend(objs);
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 
 	cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 0));
 	cl_git_pass(git_odb_read(&_obj, _odb, &_oid));
@@ -106,7 +106,7 @@ void test_odb_backend_simple__read_prefix_succeeds(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4632", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4632", GIT_OID_SHA1));
 	cl_git_pass(git_odb_read(&_obj, _odb, &_oid));
 
 	assert_object_contains(_obj, objs[0].content);
@@ -122,7 +122,7 @@ void test_odb_backend_simple__read_prefix_of_nonexisting_object_fails(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstrn(&_oid, hash, strlen(hash), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&_oid, hash, strlen(hash), GIT_OID_SHA1));
 	cl_git_fail_with(GIT_ENOTFOUND, git_odb_read(&_obj, _odb, &_oid));
 }
 
@@ -136,7 +136,7 @@ void test_odb_backend_simple__read_with_ambiguous_prefix_fails(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_fail_with(GIT_EAMBIGUOUS, git_odb_read_prefix(&_obj, _odb, &_oid, 7));
 }
 
@@ -150,7 +150,7 @@ void test_odb_backend_simple__read_with_highly_ambiguous_prefix(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 0));
 	cl_git_fail_with(GIT_EAMBIGUOUS, git_odb_read_prefix(&_obj, _odb, &_oid, 39));
 	cl_git_pass(git_odb_read_prefix(&_obj, _odb, &_oid, 40));
@@ -166,7 +166,7 @@ void test_odb_backend_simple__exists_succeeds(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_assert(git_odb_exists(_odb, &_oid));
 }
 
@@ -179,7 +179,7 @@ void test_odb_backend_simple__exists_fails_for_nonexisting_object(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, "f6ea0495187600e7b2288c8ac19c5886383a4633", GIT_OID_SHA1));
 	cl_assert(git_odb_exists(_odb, &_oid) == 0);
 }
 
@@ -194,7 +194,7 @@ void test_odb_backend_simple__exists_prefix_succeeds(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_pass(git_odb_exists_prefix(&found, _odb, &_oid, 12));
 	cl_assert(git_oid_equal(&found, &_oid));
 }
@@ -209,7 +209,7 @@ void test_odb_backend_simple__exists_with_ambiguous_prefix_fails(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_fail_with(GIT_EAMBIGUOUS, git_odb_exists_prefix(NULL, _odb, &_oid, 7));
 }
 
@@ -224,7 +224,7 @@ void test_odb_backend_simple__exists_with_highly_ambiguous_prefix(void)
 
 	setup_backend(objs);
 
-	cl_git_pass(git_oid_fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&_oid, objs[0].oid, GIT_OID_SHA1));
 	cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 0));
 	cl_git_fail_with(GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &_oid, 39));
 	cl_git_pass(git_odb_exists_prefix(&found, _odb, &_oid, 40));
diff --git a/tests/libgit2/odb/emptyobjects.c b/tests/libgit2/odb/emptyobjects.c
index cc287935e..e7cc668d1 100644
--- a/tests/libgit2/odb/emptyobjects.c
+++ b/tests/libgit2/odb/emptyobjects.c
@@ -24,7 +24,7 @@ void test_odb_emptyobjects__blob_notfound(void)
 	git_oid id, written_id;
 	git_blob *blob;
 
-	cl_git_pass(git_oid_fromstr(&id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", GIT_OID_SHA1));
 	cl_git_fail_with(GIT_ENOTFOUND, git_blob_lookup(&blob, g_repo, &id));
 
 	cl_git_pass(git_odb_write(&written_id, g_odb, "", 0, GIT_OBJECT_BLOB));
@@ -36,7 +36,7 @@ void test_odb_emptyobjects__read_tree(void)
 	git_oid id;
 	git_tree *tree;
 
-	cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", GIT_OID_SHA1));
 	cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
 	cl_assert_equal_i(GIT_OBJECT_TREE, git_object_type((git_object *) tree));
 	cl_assert_equal_i(0, git_tree_entrycount(tree));
@@ -49,7 +49,7 @@ void test_odb_emptyobjects__read_tree_odb(void)
 	git_oid id;
 	git_odb_object *tree_odb;
 
-	cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", GIT_OID_SHA1));
 	cl_git_pass(git_odb_read(&tree_odb, g_odb, &id));
 	cl_assert(git_odb_object_data(tree_odb));
 	cl_assert_equal_s("", git_odb_object_data(tree_odb));
diff --git a/tests/libgit2/odb/foreach.c b/tests/libgit2/odb/foreach.c
index 98b5d80b7..165a511a0 100644
--- a/tests/libgit2/odb/foreach.c
+++ b/tests/libgit2/odb/foreach.c
@@ -51,7 +51,7 @@ void test_odb_foreach__one_pack(void)
 	git_odb_backend *backend = NULL;
 	int nobj = 0;
 
-	cl_git_pass(git_odb_new(&_odb, NULL));
+	cl_git_pass(git_odb__new(&_odb, NULL));
 	cl_git_pass(git_odb_backend_one_pack(&backend, cl_fixture("testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx")));
 	cl_git_pass(git_odb_add_backend(_odb, backend, 1));
 	_repo = NULL;
diff --git a/tests/libgit2/odb/freshen.c b/tests/libgit2/odb/freshen.c
index ceacede2e..e337c82b7 100644
--- a/tests/libgit2/odb/freshen.c
+++ b/tests/libgit2/odb/freshen.c
@@ -43,7 +43,7 @@ void test_odb_freshen__loose_blob(void)
 	git_oid expected_id, id;
 	struct stat before, after;
 
-	cl_git_pass(git_oid_fromstr(&expected_id, LOOSE_BLOB_ID, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&expected_id, LOOSE_BLOB_ID, GIT_OID_SHA1));
 	set_time_wayback(&before, LOOSE_BLOB_FN);
 
 	/* make sure we freshen a blob */
@@ -64,7 +64,7 @@ void test_odb_freshen__readonly_object(void)
 	git_oid expected_id, id;
 	struct stat before, after;
 
-	cl_git_pass(git_oid_fromstr(&expected_id, UNIQUE_BLOB_ID, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&expected_id, UNIQUE_BLOB_ID, GIT_OID_SHA1));
 
 	cl_git_pass(git_blob_create_from_buffer(&id, repo, UNIQUE_STR, CONST_STRLEN(UNIQUE_STR)));
 	cl_assert_equal_oid(&expected_id, &id);
@@ -89,7 +89,7 @@ void test_odb_freshen__loose_tree(void)
 	git_tree *tree;
 	struct stat before, after;
 
-	cl_git_pass(git_oid_fromstr(&expected_id, LOOSE_TREE_ID, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&expected_id, LOOSE_TREE_ID, GIT_OID_SHA1));
 	set_time_wayback(&before, LOOSE_TREE_FN);
 
 	cl_git_pass(git_tree_lookup(&tree, repo, &expected_id));
@@ -113,11 +113,11 @@ void test_odb_freshen__tree_during_commit(void)
 	git_signature *signature;
 	struct stat before, after;
 
-	cl_git_pass(git_oid_fromstr(&tree_id, LOOSE_TREE_ID, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&tree_id, LOOSE_TREE_ID, GIT_OID_SHA1));
 	cl_git_pass(git_tree_lookup(&tree, repo, &tree_id));
 	set_time_wayback(&before, LOOSE_TREE_FN);
 
-	cl_git_pass(git_oid_fromstr(&parent_id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&parent_id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OID_SHA1));
 	cl_git_pass(git_commit_lookup(&parent, repo, &parent_id));
 
 	cl_git_pass(git_signature_new(&signature,
@@ -147,7 +147,7 @@ void test_odb_freshen__packed_object(void)
 	struct stat before, after;
 	struct p_timeval old_times[2];
 
-	cl_git_pass(git_oid_fromstr(&expected_id, PACKED_ID, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&expected_id, PACKED_ID, GIT_OID_SHA1));
 
 	old_times[0].tv_sec = 1234567890;
 	old_times[0].tv_usec = 0;
diff --git a/tests/libgit2/odb/largefiles.c b/tests/libgit2/odb/largefiles.c
index 0ecbd6f6b..2ec48102b 100644
--- a/tests/libgit2/odb/largefiles.c
+++ b/tests/libgit2/odb/largefiles.c
@@ -57,7 +57,7 @@ void test_odb_largefiles__write_from_memory(void)
 	for (i = 0; i < (3041*126103); i++)
 		cl_git_pass(git_str_puts(&buf, "Hello, world.\n"));
 
-	git_oid_fromstr(&expected, "3fb56989cca483b21ba7cb0a6edb229d10e1c26c", GIT_OID_SHA1);
+	git_oid__fromstr(&expected, "3fb56989cca483b21ba7cb0a6edb229d10e1c26c", GIT_OID_SHA1);
 	cl_git_pass(git_odb_write(&oid, odb, buf.ptr, buf.size, GIT_OBJECT_BLOB));
 
 	cl_assert_equal_oid(&expected, &oid);
@@ -75,7 +75,7 @@ void test_odb_largefiles__streamwrite(void)
 		!cl_is_env_set("GITTEST_SLOW"))
 		cl_skip();
 
-	git_oid_fromstr(&expected, "3fb56989cca483b21ba7cb0a6edb229d10e1c26c", GIT_OID_SHA1);
+	git_oid__fromstr(&expected, "3fb56989cca483b21ba7cb0a6edb229d10e1c26c", GIT_OID_SHA1);
 	writefile(&oid);
 
 	cl_assert_equal_oid(&expected, &oid);
diff --git a/tests/libgit2/odb/loose.c b/tests/libgit2/odb/loose.c
index 9651ebab6..e79525478 100644
--- a/tests/libgit2/odb/loose.c
+++ b/tests/libgit2/odb/loose.c
@@ -44,8 +44,8 @@ static void test_read_object(object_data *data)
 
 	write_object_files(data);
 
-	cl_git_pass(git_odb_open(&odb, "test-objects", &opts));
-	cl_git_pass(git_oid_fromstr(&id, data->id, data->id_type));
+	cl_git_pass(git_odb__open(&odb, "test-objects", &opts));
+	cl_git_pass(git_oid__fromstr(&id, data->id, data->id_type));
 	cl_git_pass(git_odb_read(&obj, odb, &id));
 
 	tmp.data = obj->buffer;
@@ -70,8 +70,8 @@ static void test_read_header(object_data *data)
 
 	write_object_files(data);
 
-	cl_git_pass(git_odb_open(&odb, "test-objects", &opts));
-	cl_git_pass(git_oid_fromstr(&id, data->id, data->id_type));
+	cl_git_pass(git_odb__open(&odb, "test-objects", &opts));
+	cl_git_pass(git_oid__fromstr(&id, data->id, data->id_type));
 	cl_git_pass(git_odb_read_header(&len, &type, odb, &id));
 
 	cl_assert_equal_sz(data->dlen, len);
@@ -95,8 +95,8 @@ static void test_readstream_object(object_data *data, size_t blocksize)
 
 	write_object_files(data);
 
-	cl_git_pass(git_odb_open(&odb, "test-objects", &opts));
-	cl_git_pass(git_oid_fromstr(&id, data->id, data->id_type));
+	cl_git_pass(git_odb__open(&odb, "test-objects", &opts));
+	cl_git_pass(git_oid__fromstr(&id, data->id, data->id_type));
 	cl_git_pass(git_odb_open_rstream(&stream, &tmp.len, &tmp.type, odb, &id));
 
 	remain = tmp.len;
@@ -139,20 +139,20 @@ void test_odb_loose__exists_sha1(void)
 	git_odb *odb;
 
 	write_object_files(&one);
-	cl_git_pass(git_odb_open(&odb, "test-objects", NULL));
+	cl_git_pass(git_odb__open(&odb, "test-objects", NULL));
 
-	cl_git_pass(git_oid_fromstr(&id, one.id, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&id, one.id, GIT_OID_SHA1));
 	cl_assert(git_odb_exists(odb, &id));
 
-	cl_git_pass(git_oid_fromstrp(&id, "8b137891", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrp(&id, "8b137891", GIT_OID_SHA1));
 	cl_git_pass(git_odb_exists_prefix(&id2, odb, &id, 8));
 	cl_assert_equal_i(0, git_oid_streq(&id2, one.id));
 
 	/* Test for a missing object */
-	cl_git_pass(git_oid_fromstr(&id, "8b137891791fe96927ad78e64b0aad7bded08baa", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&id, "8b137891791fe96927ad78e64b0aad7bded08baa", GIT_OID_SHA1));
 	cl_assert(!git_odb_exists(odb, &id));
 
-	cl_git_pass(git_oid_fromstrp(&id, "8b13789a", GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrp(&id, "8b13789a", GIT_OID_SHA1));
 	cl_assert_equal_i(GIT_ENOTFOUND, git_odb_exists_prefix(&id2, odb, &id, 8));
 
 	git_odb_free(odb);
@@ -168,20 +168,20 @@ void test_odb_loose__exists_sha256(void)
 	odb_opts.oid_type = GIT_OID_SHA256;
 
 	write_object_files(&one_sha256);
-	cl_git_pass(git_odb_open(&odb, "test-objects", &odb_opts));
+	cl_git_pass(git_odb__open(&odb, "test-objects", &odb_opts));
 
-	cl_git_pass(git_oid_fromstr(&id, one_sha256.id, GIT_OID_SHA256));
+	cl_git_pass(git_oid__fromstr(&id, one_sha256.id, GIT_OID_SHA256));
 	cl_assert(git_odb_exists(odb, &id));
 
-	cl_git_pass(git_oid_fromstrp(&id, "4c0d52d1", GIT_OID_SHA256));
+	cl_git_pass(git_oid__fromstrp(&id, "4c0d52d1", GIT_OID_SHA256));
 	cl_git_pass(git_odb_exists_prefix(&id2, odb, &id, 8));
 	cl_assert_equal_i(0, git_oid_streq(&id2, one_sha256.id));
 
 	/* Test for a missing object */
-	cl_git_pass(git_oid_fromstr(&id, "4c0d52d180c61d01ce1a91dec5ee58f0cbe65fd59433aea803ab927965493faa", GIT_OID_SHA256));
+	cl_git_pass(git_oid__fromstr(&id, "4c0d52d180c61d01ce1a91dec5ee58f0cbe65fd59433aea803ab927965493faa", GIT_OID_SHA256));
 	cl_assert(!git_odb_exists(odb, &id));
 
-	cl_git_pass(git_oid_fromstrp(&id, "4c0d52da", GIT_OID_SHA256));
+	cl_git_pass(git_oid__fromstrp(&id, "4c0d52da", GIT_OID_SHA256));
 	cl_assert_equal_i(GIT_ENOTFOUND, git_odb_exists_prefix(&id2, odb, &id, 8));
 
 	git_odb_free(odb);
@@ -296,8 +296,8 @@ static void test_write_object_permission(
 	opts.dir_mode = dir_mode;
 	opts.file_mode = file_mode;
 
-	cl_git_pass(git_odb_new(&odb, NULL));
-	cl_git_pass(git_odb_backend_loose(&backend, "test-objects", &opts));
+	cl_git_pass(git_odb__new(&odb, NULL));
+	cl_git_pass(git_odb__backend_loose(&backend, "test-objects", &opts));
 	cl_git_pass(git_odb_add_backend(odb, backend, 1));
 	cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJECT_BLOB));
 
@@ -338,8 +338,8 @@ static void write_object_to_loose_odb(int fsync)
 	opts.dir_mode = 0777;
 	opts.file_mode = 0666;
 
-	cl_git_pass(git_odb_new(&odb, NULL));
-	cl_git_pass(git_odb_backend_loose(&backend, "test-objects", &opts));
+	cl_git_pass(git_odb__new(&odb, NULL));
+	cl_git_pass(git_odb__backend_loose(&backend, "test-objects", &opts));
 	cl_git_pass(git_odb_add_backend(odb, backend, 1));
 	cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJECT_BLOB));
 	git_odb_free(odb);
diff --git a/tests/libgit2/odb/mixed.c b/tests/libgit2/odb/mixed.c
index a4823839b..19e6dcebf 100644
--- a/tests/libgit2/odb/mixed.c
+++ b/tests/libgit2/odb/mixed.c
@@ -5,7 +5,7 @@ static git_odb *_odb;
 
 void test_odb_mixed__initialize(void)
 {
-	cl_git_pass(git_odb_open(&_odb, cl_fixture("duplicate.git/objects"), NULL));
+	cl_git_pass(git_odb__open(&_odb, cl_fixture("duplicate.git/objects"), NULL));
 }
 
 void test_odb_mixed__cleanup(void)
@@ -20,13 +20,13 @@ void test_odb_mixed__dup_oid(void) {
 	git_oid oid;
 	git_odb_object *obj;
 
-	cl_git_pass(git_oid_fromstr(&oid, hex, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstr(&oid, hex, GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, GIT_OID_SHA1_HEXSIZE));
 	git_odb_object_free(obj);
 
 	cl_git_pass(git_odb_exists_prefix(NULL, _odb, &oid, GIT_OID_SHA1_HEXSIZE));
 
-	cl_git_pass(git_oid_fromstrn(&oid, short_hex, sizeof(short_hex) - 1, GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, short_hex, sizeof(short_hex) - 1, GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, sizeof(short_hex) - 1));
 	git_odb_object_free(obj);
 
@@ -48,63 +48,63 @@ void test_odb_mixed__dup_oid_prefix_0(void) {
 	/* ambiguous in the same pack file */
 
 	strncpy(hex, "dea509d0", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 
 	strncpy(hex, "dea509d09", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 	cl_assert_equal_oid(&found, git_odb_object_id(obj));
 	git_odb_object_free(obj);
 
 	strncpy(hex, "dea509d0b", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	git_odb_object_free(obj);
 
 	/* ambiguous in different pack files */
 
 	strncpy(hex, "81b5bff5", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 
 	strncpy(hex, "81b5bff5b", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 	cl_assert_equal_oid(&found, git_odb_object_id(obj));
 	git_odb_object_free(obj);
 
 	strncpy(hex, "81b5bff5f", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	git_odb_object_free(obj);
 
 	/* ambiguous in pack file and loose */
 
 	strncpy(hex, "0ddeaded", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_assert_equal_i(
 		GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 
 	strncpy(hex, "0ddeaded9", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex)));
 	cl_assert_equal_oid(&found, git_odb_object_id(obj));
 	git_odb_object_free(obj);
 
 	strncpy(hex, "0ddeadede", sizeof(hex));
-	cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
+	cl_git_pass(git_oid__fromstrn(&oid, hex, strlen(hex), GIT_OID_SHA1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex)));
 	git_odb_object_free(obj);
 }
@@ -170,7 +170,7 @@ static void setup_prefix_query(
 
 		size_t len = strlen(expand_id_test_data[i].lookup_id);
 
-		git_oid_fromstrn(&id->id, expand_id_test_data[i].lookup_id, len, GIT_OID_SHA1);
+		git_oid__fromstrn(&id->id, expand_id_test_data[i].lookup_id, len, GIT_OID_SHA1);
 		id->length = (unsigned short)len;
 		id->type = expand_id_test_data[i].expected_type;
 	}
@@ -191,7 +191,7 @@ static void assert_found_objects(git_odb_expand_id *ids)
 		git_object_t expected_type = 0;
 
 		if (expand_id_test_data[i].expected_id) {
-			git_oid_fromstr(&expected_id, expand_id_test_data[i].expected_id, GIT_OID_SHA1);
+			git_oid__fromstr(&expected_id, expand_id_test_data[i].expected_id, GIT_OID_SHA1);
 			expected_len = GIT_OID_SHA1_HEXSIZE;
 			expected_type = expand_id_test_data[i].expected_type;
 		}
diff --git a/tests/libgit2/odb/packed.c b/tests/libgit2/odb/packed.c
index 469489a29..b41041fc1 100644
--- a/tests/libgit2/odb/packed.c
+++ b/tests/libgit2/odb/packed.c
@@ -6,7 +6,7 @@ static git_odb *_odb;
 
 void test_odb_packed__initialize(void)
 {
-    cl_git_pass(git_odb_open(&_odb, cl_fixture("testrepo.git/objects"), NULL));
+    cl_git_pass(git_odb__open(&_odb, cl_fixture("testrepo.git/objects"), NULL));
 }
 
 void test_odb_packed__cleanup(void)
@@ -23,7 +23,7 @@ void test_odb_packed__mass_read(void)
 		git_oid id;
 		git_odb_object *obj;
 
-		cl_git_pass(git_oid_fromstr(&id, packed_objects[i], GIT_OID_SHA1));
+		cl_git_pass(git_oid__fromstr(&id, packed_objects[i], GIT_OID_SHA1));
 		cl_assert(git_odb_exists(_odb, &id) == 1);
 		cl_git_pass(git_odb_read(&obj, _odb, &id));
 
@@ -41,7 +41,7 @@ void test_odb_packed__read_header_0(void)
 		size_t len;
 		git_object_t type;
 
-		cl_git_pass(git_oid_fromstr(&id, packed_objects[i], GIT_OID_SHA1));
+		cl_git_pass(git_oid__fromstr(&id, packed_objects[i], GIT_OID_SHA1));
 
 		cl_git_pass(git_odb_read(&obj, _odb, &id));
 		cl_git_pass(git_odb_read_header(&len, &type, _odb, &id));
@@ -63,7 +63,7 @@ void test_odb_packed__read_header_1(void)
 		size_t len;
 		git_object_t type;
 
-		cl_git_pass(git_oid_fromstr(&id, loose_objects[i], GIT_OID_SHA1));
+		cl_git_pass(git_oid__fromstr(&id, loose_objects[i], GIT_OID_SHA1));
 
 		cl_assert(git_odb_exists(_odb, &id) == 1);
 
diff --git a/tests/libgit2/odb/packed_one.c b/tests/libgit2/odb/packed_one.c
index 777b54b98..7a1d3d913 100644
--- a/tests/libgit2/odb/packed_one.c
+++ b/tests/libgit2/odb/packed_one.c
@@ -10,7 +10,7 @@ void test_odb_packed_one__initialize(void)
 {
 	git_odb_backend *backend = NULL;
 
-	cl_git_pass(git_odb_new(&_odb, NULL));
+	cl_git_pass(git_odb__new(&_odb, NULL));
 	cl_git_pass(git_odb_backend_one_pack(&backend, cl_fixture("testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx")));
 	cl_git_pass(git_odb_add_backend(_odb, backend, 1));
 }
@@ -29,7 +29,7 @@ void test_odb_packed_one__mass_read(void)
 		git_oid id;
 		git_odb_object *obj;
 
-		cl_git_pass(git_oid_fromstr(&id, packed_objects_one[i], GIT_OID_SHA1));
+		cl_git_pass(git_oid__fromstr(&id, packed_objects_one[i], GIT_OID_SHA1));
 		cl_assert(git_odb_exists(_odb, &id) == 1);
 		cl_git_pass(git_odb_read(&obj, _odb, &id));
 
@@ -47,7 +47,7 @@ void test_odb_packed_one__read_header_0(void)
 		size_t len;
 		git_object_t type;
 
-		cl_git_pass(git_oid_fromstr(&id, packed_objects_one[i], GIT_OID_SHA1));
+		cl_git_pass(git_oid__fromstr(&id, packed_objects_one[i], GIT_OID_SHA1));
 
 		cl_git_pass(git_odb_read(&obj, _odb, &id));
 		cl_git_pass(git_odb_read_header(&len, &type, _odb, &id));
diff --git a/tests/libgit2/odb/sorting.c b/tests/libgit2/odb/sorting.c
index 33ce289b5..1010872f4 100644
--- a/tests/libgit2/odb/sorting.c
+++ b/tests/libgit2/odb/sorting.c
@@ -37,7 +37,7 @@ static git_odb *_odb;
 
 void test_odb_sorting__initialize(void)
 {
-	cl_git_pass(git_odb_new(&_odb, NULL));
+	cl_git_pass(git_odb__new(&_odb, NULL));
 }
 
 void test_odb_sorting__cleanup(void)
@@ -83,9 +83,9 @@ void test_odb_sorting__override_default_backend_priority(void)
 	cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ODB_LOOSE_PRIORITY, 5));
 	cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ODB_PACKED_PRIORITY, 3));
 	git_odb_backend_pack(&packed, "./testrepo.git/objects");
-	git_odb_backend_loose(&loose, "./testrepo.git/objects", NULL);
+	git_odb__backend_loose(&loose, "./testrepo.git/objects", NULL);
 
-	cl_git_pass(git_odb_open(&new_odb, cl_fixture("testrepo.git/objects"), NULL));
+	cl_git_pass(git_odb__open(&new_odb, cl_fixture("testrepo.git/objects"), NULL));
 	cl_assert_equal_sz(2, git_odb_num_backends(new_odb));
 
 	cl_git_pass(git_odb_get_backend(&backend, new_odb, 0));