summaryrefslogtreecommitdiff
path: root/tests/revwalk
diff options
context:
space:
mode:
Diffstat (limited to 'tests/revwalk')
-rw-r--r--tests/revwalk/basic.c6
-rw-r--r--tests/revwalk/mergebase.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index efb48cbf1..2eb0c3537 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -292,9 +292,9 @@ void test_revwalk_basic__multiple_push_1(void)
}
/*
-* Difference between test_revwalk_basic__multiple_push_1 and
+* Difference between test_revwalk_basic__multiple_push_1 and
* test_revwalk_basic__multiple_push_2 is in the order reference
-* refs/heads/packed-test and commit 5b5b02 are pushed.
+* refs/heads/packed-test and commit 5b5b02 are pushed.
* revwalk should return same commits in both the tests.
* $ git rev-list 5b5b02 HEAD ^refs/heads/packed-test
@@ -509,7 +509,7 @@ void test_revwalk_basic__big_timestamp(void)
revwalk_basic_setup_walk("testrepo.git");
cl_git_pass(git_repository_head(&head, _repo));
- cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJECT_COMMIT));
/* Commit with a far-ahead timestamp, we should be able to parse it in the revwalk */
cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595, 0));
diff --git a/tests/revwalk/mergebase.c b/tests/revwalk/mergebase.c
index ee078b3e7..bee0b926e 100644
--- a/tests/revwalk/mergebase.c
+++ b/tests/revwalk/mergebase.c
@@ -198,12 +198,12 @@ static void assert_mergebase_many(const char *expected_sha, int count, ...)
memset(oids, 0x0, count * sizeof(git_oid));
va_start(ap, count);
-
+
for (i = 0; i < count; ++i) {
partial_oid = va_arg(ap, char *);
cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid)));
- cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJECT_COMMIT));
git_oid_cpy(&oids[i], git_object_id(object));
git_object_free(object);
}
@@ -267,7 +267,7 @@ static void assert_mergebase_octopus(const char *expected_sha, int count, ...)
partial_oid = va_arg(ap, char *);
cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid)));
- cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJECT_COMMIT));
git_oid_cpy(&oids[i], git_object_id(object));
git_object_free(object);
}