Change git_revparse to output git_object pointers

This will probably prevent many lookup/free
operations in calling code.

2 files changed, 10 insertions, 16 deletions

diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c
index da9e676a9..12f922630 100644
--- a/tests-clar/stash/drop.c
+++ b/tests-clar/stash/drop.c
@@ -140,30 +140,29 @@ void test_stash_drop__dropping_the_last_entry_removes_the_stash(void)
 
 void retrieve_top_stash_id(git_oid *out)
 {
-	git_oid top_stash_id;
+	git_object *top_stash;
 
-	cl_git_pass(git_revparse(&top_stash_id, NULL, NULL, repo, "stash@{0}"));
+	cl_git_pass(git_revparse_single(&top_stash, repo, "stash@{0}"));
 	cl_git_pass(git_reference_name_to_id(out, repo, GIT_REFS_STASH_FILE));
 
-	cl_assert_equal_i(true, git_oid_cmp(out, &top_stash_id) == 0);
+	cl_assert_equal_i(true, git_oid_cmp(out, git_object_id(top_stash)) == 0);
 }
 
 void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void)
 {
-	git_oid next_top_stash_id;
+	git_object *next_top_stash;
 	git_oid oid;
 
 	push_three_states();
 
 	retrieve_top_stash_id(&oid);
 
-	cl_git_pass(git_revparse(&next_top_stash_id, NULL, NULL, repo, "stash@{1}"));
-	cl_assert_equal_i(false, git_oid_cmp(&oid, &next_top_stash_id) == 0);
+	cl_git_pass(git_revparse_single(&next_top_stash, repo, "stash@{1}"));
+	cl_assert_equal_i(false, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
 
 	cl_git_pass(git_stash_drop(repo, 0));
 
 	retrieve_top_stash_id(&oid);
 
-	cl_assert_equal_i(
-		true, git_oid_cmp(&oid, &next_top_stash_id) == 0);
+	cl_git_pass(git_oid_cmp(&oid, git_object_id(next_top_stash)));
 }
diff --git a/tests-clar/stash/save.c b/tests-clar/stash/save.c
index 4185e549c..eae116ac5 100644
--- a/tests-clar/stash/save.c
+++ b/tests-clar/stash/save.c
@@ -37,11 +37,10 @@ void test_stash_save__cleanup(void)
 
 static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type)
 {
-	git_oid oid;
 	int result;
 	git_object *obj;
 
-	result = git_revparse(&oid, NULL, NULL, repo, revision);
+	result = git_revparse_single(&obj, repo, revision);
 
 	if (!expected_oid) {
 		cl_assert_equal_i(GIT_ENOTFOUND, result);
@@ -49,9 +48,7 @@ static void assert_object_oid(const char* revision, const char* expected_oid, gi
 	} else
 		cl_assert_equal_i(0, result);
 
-	cl_git_pass(git_oid_streq(&oid, expected_oid));
-
-	cl_git_pass(git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY));
+	cl_git_pass(git_oid_streq(git_object_id(obj), expected_oid));
 	cl_assert_equal_i(type, git_object_type(obj));
 	git_object_free(obj);
 }
@@ -147,11 +144,9 @@ void test_stash_save__can_keep_index(void)
 
 static void assert_commit_message_contains(const char *revision, const char *fragment)
 {
-	git_oid oid;
 	git_commit *commit;
 
-	cl_git_pass(git_revparse(&oid, NULL, NULL, repo, revision));
-	cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+	cl_git_pass(git_revparse_single((git_object**)&commit, repo, revision));
 
 	cl_assert(strstr(git_commit_message(commit), fragment) != NULL);