diff options
Diffstat (limited to 'tests-clar/refs/delete.c')
| -rw-r--r-- | tests-clar/refs/delete.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests-clar/refs/delete.c b/tests-clar/refs/delete.c index 912f41456..ac517d869 100644 --- a/tests-clar/refs/delete.c +++ b/tests-clar/refs/delete.c @@ -3,6 +3,7 @@ #include "repository.h" #include "git2/reflog.h" #include "reflog.h" +#include "ref_helpers.h" static const char *packed_test_head_name = "refs/heads/packed-test"; static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; @@ -37,10 +38,11 @@ void test_refs_delete__packed_loose(void) cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); /* Ensure it's the loose version that has been found */ - cl_assert(git_reference_is_packed(looked_up_ref) == 0); + cl_assert(reference_is_packed(looked_up_ref) == 0); /* Now that the reference is deleted... */ cl_git_pass(git_reference_delete(looked_up_ref)); + git_reference_free(looked_up_ref); /* Looking up the reference once again should not retrieve it */ cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, packed_test_head_name)); @@ -56,30 +58,34 @@ void test_refs_delete__packed_only(void) { // can delete a just packed reference git_reference *ref; + git_refdb *refdb; git_oid id; const char *new_ref = "refs/heads/new_ref"; git_oid_fromstr(&id, current_master_tip); /* Create and write the new object id reference */ - cl_git_pass(git_reference_create_oid(&ref, g_repo, new_ref, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &id, 0)); git_reference_free(ref); /* Lookup the reference */ cl_git_pass(git_reference_lookup(&ref, g_repo, new_ref)); /* Ensure it's a loose reference */ - cl_assert(git_reference_is_packed(ref) == 0); + cl_assert(reference_is_packed(ref) == 0); /* Pack all existing references */ - cl_git_pass(git_reference_packall(g_repo)); + cl_git_pass(git_repository_refdb(&refdb, g_repo)); + cl_git_pass(git_refdb_compress(refdb)); /* Reload the reference from disk */ - cl_git_pass(git_reference_reload(ref)); + git_reference_free(ref); + cl_git_pass(git_reference_lookup(&ref, g_repo, new_ref)); /* Ensure it's a packed reference */ - cl_assert(git_reference_is_packed(ref) == 1); + cl_assert(reference_is_packed(ref) == 1); /* This should pass */ cl_git_pass(git_reference_delete(ref)); + git_reference_free(ref); } |