summaryrefslogtreecommitdiff
path: root/tests-clar/stash/save.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests-clar/stash/save.c')
-rw-r--r--tests-clar/stash/save.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests-clar/stash/save.c b/tests-clar/stash/save.c
index 588dfc3ea..eae116ac5 100644
--- a/tests-clar/stash/save.c
+++ b/tests-clar/stash/save.c
@@ -37,10 +37,10 @@ void test_stash_save__cleanup(void)
static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type)
{
- git_object *object;
int result;
+ git_object *obj;
- result = git_revparse_single(&object, repo, revision);
+ result = git_revparse_single(&obj, repo, revision);
if (!expected_oid) {
cl_assert_equal_i(GIT_ENOTFOUND, result);
@@ -48,10 +48,9 @@ static void assert_object_oid(const char* revision, const char* expected_oid, gi
} else
cl_assert_equal_i(0, result);
- cl_assert_equal_i(type, git_object_type(object));
- cl_git_pass(git_oid_streq(git_object_id(object), expected_oid));
-
- git_object_free(object);
+ 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);
}
static void assert_blob_oid(const char* revision, const char* expected_oid)
@@ -147,7 +146,7 @@ static void assert_commit_message_contains(const char *revision, const char *fra
{
git_commit *commit;
- cl_git_pass(git_revparse_single(((git_object **)&commit), repo, revision));
+ cl_git_pass(git_revparse_single((git_object**)&commit, repo, revision));
cl_assert(strstr(git_commit_message(commit), fragment) != NULL);