diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2018-11-28 14:26:57 +0000 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-12-01 11:54:57 +0000 |
commit | 168fe39bea3368972a8b1a33d5908e73bc790c18 (patch) | |
tree | c6d07340e2d8d2d66091c44c7763f3e1823acca2 /tests/reset | |
parent | 18e71e6d597abe6c7feb666429c921bd19dc0ba8 (diff) | |
download | libgit2-168fe39bea3368972a8b1a33d5908e73bc790c18.tar.gz |
object_type: use new enumeration namesethomson/index_fixes
Use the new object_type enumeration names within the codebase.
Diffstat (limited to 'tests/reset')
-rw-r--r-- | tests/reset/hard.c | 6 | ||||
-rw-r--r-- | tests/reset/soft.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/reset/hard.c b/tests/reset/hard.c index d47ddd842..b6e91395b 100644 --- a/tests/reset/hard.c +++ b/tests/reset/hard.c @@ -248,7 +248,7 @@ void test_reset_hard__switch_file_to_dir(void) git_oid src_id, tgt_id; cl_git_pass(git_repository_odb(&odb, repo)); - cl_git_pass(git_odb_write(&entry.id, odb, "", 0, GIT_OBJ_BLOB)); + cl_git_pass(git_odb_write(&entry.id, odb, "", 0, GIT_OBJECT_BLOB)); git_odb_free(odb); entry.mode = GIT_FILEMODE_BLOB; @@ -282,12 +282,12 @@ void test_reset_hard__switch_file_to_dir(void) git_signature_free(sig); /* Let's go to a known state of the src commit with the file named 'dir' */ - cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJ_COMMIT)); + cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJECT_COMMIT)); cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); git_object_free(commit); /* And now we move over to the commit with the directory named 'dir' */ - cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJ_COMMIT)); + cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJECT_COMMIT)); cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); git_object_free(commit); } diff --git a/tests/reset/soft.c b/tests/reset/soft.c index 0ad47be2c..d9cfb0553 100644 --- a/tests/reset/soft.c +++ b/tests/reset/soft.c @@ -149,7 +149,7 @@ void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE git_index_free(index); cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&target, head, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&target, head, GIT_OBJECT_COMMIT)); git_reference_free(head); cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL)); |