From 168fe39bea3368972a8b1a33d5908e73bc790c18 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 28 Nov 2018 14:26:57 +0000 Subject: object_type: use new enumeration names Use the new object_type enumeration names within the codebase. --- tests/submodule/init.c | 2 +- tests/submodule/update.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/submodule') diff --git a/tests/submodule/init.c b/tests/submodule/init.c index b84adf508..84143e18f 100644 --- a/tests/submodule/init.c +++ b/tests/submodule/init.c @@ -87,7 +87,7 @@ void test_submodule_init__relative_url_detached_head(void) /* Put the parent repository into a detached head state. */ cl_git_pass(git_repository_head(&head_ref, g_repo)); - cl_git_pass(git_reference_peel(&head_commit, head_ref, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&head_commit, head_ref, GIT_OBJECT_COMMIT)); cl_git_pass(git_repository_set_head_detached(g_repo, git_commit_id((git_commit *)head_commit))); diff --git a/tests/submodule/update.c b/tests/submodule/update.c index cbd519d81..08a279a48 100644 --- a/tests/submodule/update.c +++ b/tests/submodule/update.c @@ -241,7 +241,7 @@ void test_submodule_update__update_already_checked_out_submodule(void) checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT)); cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); @@ -277,7 +277,7 @@ void test_submodule_update__update_already_checked_out_submodule(void) /* verify that the expected callbacks have been called. */ cl_assert_equal_i(1, update_payload.checkout_progress_called); - + git_submodule_free(sm); git_object_free(branch_commit); git_reference_free(branch_reference); @@ -319,7 +319,7 @@ void test_submodule_update__update_blocks_on_dirty_wd(void) checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT)); cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); @@ -396,7 +396,7 @@ void test_submodule_update__can_force_update(void) checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); + cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT)); cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); -- cgit v1.2.1