summaryrefslogtreecommitdiff
path: root/tests/rebase/merge.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-11-28 14:26:57 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2018-12-01 11:54:57 +0000
commit168fe39bea3368972a8b1a33d5908e73bc790c18 (patch)
treec6d07340e2d8d2d66091c44c7763f3e1823acca2 /tests/rebase/merge.c
parent18e71e6d597abe6c7feb666429c921bd19dc0ba8 (diff)
downloadlibgit2-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/rebase/merge.c')
-rw-r--r--tests/rebase/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rebase/merge.c b/tests/rebase/merge.c
index 830593707..6a2bd38d2 100644
--- a/tests/rebase/merge.c
+++ b/tests/rebase/merge.c
@@ -647,7 +647,7 @@ static void test_copy_note(
cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
cl_git_pass(git_reference_peel((git_object **)&branch_commit,
- branch_ref, GIT_OBJ_COMMIT));
+ branch_ref, GIT_OBJECT_COMMIT));
/* Add a note to a commit */
cl_git_pass(git_note_create(&note_id, repo, "refs/notes/test",