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/diff | |
| parent | 18e71e6d597abe6c7feb666429c921bd19dc0ba8 (diff) | |
| download | libgit2-ethomson/index_fixes.tar.gz | |
object_type: use new enumeration namesethomson/index_fixes
Use the new object_type enumeration names within the codebase.
Diffstat (limited to 'tests/diff')
| -rw-r--r-- | tests/diff/diff_helpers.c | 4 | ||||
| -rw-r--r-- | tests/diff/rename.c | 2 | ||||
| -rw-r--r-- | tests/diff/workdir.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/diff/diff_helpers.c b/tests/diff/diff_helpers.c index 50752b203..fdedd89ca 100644 --- a/tests/diff/diff_helpers.c +++ b/tests/diff/diff_helpers.c @@ -12,9 +12,9 @@ git_tree *resolve_commit_oid_to_tree( git_tree *tree = NULL; if (git_oid_fromstrn(&oid, partial_oid, len) == 0) - cl_git_pass(git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY)); + cl_git_pass(git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJECT_ANY)); - cl_git_pass(git_object_peel((git_object **) &tree, obj, GIT_OBJ_TREE)); + cl_git_pass(git_object_peel((git_object **) &tree, obj, GIT_OBJECT_TREE)); git_object_free(obj); return tree; } diff --git a/tests/diff/rename.c b/tests/diff/rename.c index 0ba9330ac..2166ea521 100644 --- a/tests/diff/rename.c +++ b/tests/diff/rename.c @@ -418,7 +418,7 @@ void test_diff_rename__test_small_files(void) cl_git_pass(git_index_add_bypath(index, "small.txt")); cl_git_pass(git_repository_head(&head_reference, g_repo)); - cl_git_pass(git_reference_peel((git_object**)&head_commit, head_reference, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel((git_object**)&head_commit, head_reference, GIT_OBJECT_COMMIT)); cl_git_pass(git_commit_tree(&head_tree, head_commit)); cl_git_pass(git_index_write_tree(&oid, index)); cl_git_pass(git_tree_lookup(&commit_tree, g_repo, &oid)); diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index b1d9aef60..f42121ff8 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -2016,7 +2016,7 @@ void test_diff_workdir__only_writes_index_when_necessary(void) cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_repository_head(&head, g_repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT)); cl_git_pass(git_reset(g_repo, head_object, GIT_RESET_HARD, NULL)); |
