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/merge/trees/automerge.c | |
| 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/merge/trees/automerge.c')
| -rw-r--r-- | tests/merge/trees/automerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c index e16b829ee..e4efba51c 100644 --- a/tests/merge/trees/automerge.c +++ b/tests/merge/trees/automerge.c @@ -100,7 +100,7 @@ void test_merge_trees_automerge__automerge(void) cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL); cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE)); - cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB)); + cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJECT_BLOB)); cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0); git_index_free(index); |