summaryrefslogtreecommitdiff
path: root/tests/t1003-readpackedref.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/t1003-readpackedref.c')
-rw-r--r--tests/t1003-readpackedref.c31
1 files changed, 9 insertions, 22 deletions
diff --git a/tests/t1003-readpackedref.c b/tests/t1003-readpackedref.c
index 0d210fd35..d76bdcf3e 100644
--- a/tests/t1003-readpackedref.c
+++ b/tests/t1003-readpackedref.c
@@ -8,45 +8,32 @@ static const char *packed_test_head_name = "refs/heads/packed-test";
BEGIN_TEST(packed_reference_looking_up)
git_repository *repo;
git_reference *reference;
- git_reference_object_id *packed_ref;
git_object *object;
- git_oid id;
must_pass(git_repository_open(&repo, REPOSITORY_FOLDER));
-
- must_pass(git_repository_reference_lookup(&reference, repo, packed_head_name));
- must_be_true(reference->type == GIT_REF_OBJECT_ID);
- must_be_true(reference->is_packed == 1);
+ must_pass(git_repository_lookup_ref(&reference, repo, packed_head_name));
+ must_be_true(reference->type == GIT_REF_OID);
+ must_be_true(reference->packed == 1);
must_be_true(strcmp(reference->name, packed_head_name) == 0);
- packed_ref = (git_reference_object_id *)reference;
-
- must_pass(git_repository_lookup(&object, repo, &packed_ref->id, GIT_OBJ_ANY));
+ must_pass(git_repository_lookup(&object, repo, git_reference_oid(reference), GIT_OBJ_ANY));
must_be_true(object != NULL);
must_be_true(git_object_type(object) == GIT_OBJ_COMMIT);
-
git_repository_free(repo);
END_TEST
BEGIN_TEST(packed_exists_but_more_recent_loose_reference_is_retrieved)
git_repository *repo;
git_reference *reference;
- git_reference_object_id *packed_ref;
- git_object *object;
- git_oid id;
must_pass(git_repository_open(&repo, REPOSITORY_FOLDER));
-
-
- must_pass(git_repository_reference_lookup(&reference, repo, packed_head_name)); /* Triggers load and eager parsing of all packed references */
-
- must_pass(git_repository_reference_lookup(&reference, repo, packed_test_head_name));
- must_be_true(reference->type == GIT_REF_OBJECT_ID);
- must_be_true(reference->is_packed == 0);
+ must_pass(git_repository_lookup_ref(&reference, repo, packed_head_name));
+ must_pass(git_repository_lookup_ref(&reference, repo, packed_test_head_name));
+ must_be_true(reference->type == GIT_REF_OID);
+ must_be_true(reference->packed == 0);
must_be_true(strcmp(reference->name, packed_test_head_name) == 0);
-
git_repository_free(repo);
-END_TEST \ No newline at end of file
+END_TEST