diff --git a/tests/t10-refs.c b/tests/t10-refs.c index 45ee09a79..b53bcae53 100644 --- a/tests/t10-refs.c +++ b/tests/t10-refs.c @@ -98,19 +98,19 @@ BEGIN_TEST("readsymref", nested_symbolic_reference_looking_up) must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - must_pass(git_repository_lookup_ref(&reference, repo, head_tracker_sym_ref_name)); - must_be_true(reference->type == GIT_REF_SYMBOLIC); - must_be_true(reference->packed == 0); - must_be_true(strcmp(reference->name, head_tracker_sym_ref_name) == 0); - - must_pass(git_reference_resolve(&resolved_ref, reference)); - must_be_true(resolved_ref->type == GIT_REF_OID); - - must_pass(git_repository_lookup(&object, repo, git_reference_oid(resolved_ref), GIT_OBJ_ANY)); - must_be_true(object != NULL); - must_be_true(git_object_type(object) == GIT_OBJ_COMMIT); - - git_oid_mkstr(&id, current_master_tip); + must_pass(git_repository_lookup_ref(&reference, repo, head_tracker_sym_ref_name)); + must_be_true(reference->type == GIT_REF_SYMBOLIC); + must_be_true(reference->packed == 0); + must_be_true(strcmp(reference->name, head_tracker_sym_ref_name) == 0); + + must_pass(git_reference_resolve(&resolved_ref, reference)); + must_be_true(resolved_ref->type == GIT_REF_OID); + + must_pass(git_repository_lookup(&object, repo, git_reference_oid(resolved_ref), GIT_OBJ_ANY)); + must_be_true(object != NULL); + must_be_true(git_object_type(object) == GIT_OBJ_COMMIT); + + git_oid_mkstr(&id, current_master_tip); must_be_true(git_oid_cmp(&id, git_object_id(object)) == 0); git_repository_free(repo); @@ -122,17 +122,17 @@ BEGIN_TEST("readsymref", looking_up_head_then_master) must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - must_pass(git_repository_lookup_ref(&reference, repo, head_tracker_sym_ref_name)); - must_pass(git_reference_resolve(&resolved_ref, reference)); - comp_base_ref = resolved_ref; - - must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); - must_pass(git_reference_resolve(&resolved_ref, reference)); - must_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); - - must_pass(git_repository_lookup_ref(&reference, repo, current_head_target)); + must_pass(git_repository_lookup_ref(&reference, repo, head_tracker_sym_ref_name)); must_pass(git_reference_resolve(&resolved_ref, reference)); - must_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); + comp_base_ref = resolved_ref; + + must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); + must_pass(git_reference_resolve(&resolved_ref, reference)); + must_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); + + must_pass(git_repository_lookup_ref(&reference, repo, current_head_target)); + must_pass(git_reference_resolve(&resolved_ref, reference)); + must_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); git_repository_free(repo); END_TEST @@ -147,7 +147,7 @@ BEGIN_TEST("readsymref", looking_up_master_then_head) must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); must_pass(git_reference_resolve(&resolved_ref, reference)); - must_pass(git_oid_cmp(git_reference_oid(master_ref), git_reference_oid(resolved_ref))); + must_pass(git_oid_cmp(git_reference_oid(master_ref), git_reference_oid(resolved_ref))); git_repository_free(repo); END_TEST @@ -196,7 +196,7 @@ BEGIN_TEST("createref", create_new_symbolic_ref) const char *new_head_tracker = "another-head-tracker"; - git_oid_mkstr(&id, current_master_tip); + git_oid_mkstr(&id, current_master_tip); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); @@ -244,7 +244,7 @@ BEGIN_TEST("createref", create_new_object_id_ref) const char *new_head = "refs/heads/new-head"; - git_oid_mkstr(&id, current_master_tip); + git_oid_mkstr(&id, current_master_tip); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER));