diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/merge/workdir/analysis.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c index d4cf587c4..85918abe4 100644 --- a/tests/merge/workdir/analysis.c +++ b/tests/merge/workdir/analysis.c @@ -38,7 +38,7 @@ void test_merge_workdir_analysis__cleanup(void) static void analysis_from_branch( git_merge_analysis_t *merge_analysis, - git_merge_config_t *merge_config, + git_merge_preference_t *merge_pref, const char *branchname) { git_buf refname = GIT_BUF_INIT; @@ -50,7 +50,7 @@ static void analysis_from_branch( cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&refname))); cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref)); - cl_git_pass(git_merge_analysis(merge_analysis, merge_config, repo, (const git_merge_head **)&their_head, 1)); + cl_git_pass(git_merge_analysis(merge_analysis, merge_pref, repo, (const git_merge_head **)&their_head, 1)); git_buf_free(&refname); git_merge_head_free(their_head); @@ -60,9 +60,9 @@ static void analysis_from_branch( void test_merge_workdir_analysis__fastforward(void) { git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; - analysis_from_branch(&merge_analysis, &merge_config, FASTFORWARD_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); } @@ -70,40 +70,40 @@ void test_merge_workdir_analysis__fastforward(void) void test_merge_workdir_analysis__no_fastforward(void) { git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; - analysis_from_branch(&merge_analysis, &merge_config, NOFASTFORWARD_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis); } void test_merge_workdir_analysis__uptodate(void) { git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; - analysis_from_branch(&merge_analysis, &merge_config, UPTODATE_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, UPTODATE_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); } void test_merge_workdir_analysis__uptodate_merging_prev_commit(void) { git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; - analysis_from_branch(&merge_analysis, &merge_config, PREVIOUS_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, PREVIOUS_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); } void test_merge_workdir_analysis__unborn(void) { git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; git_buf master = GIT_BUF_INIT; git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master"); p_unlink(git_buf_cstr(&master)); - analysis_from_branch(&merge_analysis, &merge_config, NOFASTFORWARD_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (merge_analysis & GIT_MERGE_ANALYSIS_UNBORN)); @@ -114,27 +114,27 @@ void test_merge_workdir_analysis__fastforward_with_config_noff(void) { git_config *config; git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; git_repository_config(&config, repo); git_config_set_string(config, "merge.ff", "false"); - analysis_from_branch(&merge_analysis, &merge_config, FASTFORWARD_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); - cl_assert_equal_i(GIT_MERGE_CONFIG_NO_FASTFORWARD, (merge_config & GIT_MERGE_CONFIG_NO_FASTFORWARD)); + cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)); } void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void) { git_config *config; git_merge_analysis_t merge_analysis; - git_merge_config_t merge_config; + git_merge_preference_t merge_pref; git_repository_config(&config, repo); git_config_set_string(config, "merge.ff", "only"); - analysis_from_branch(&merge_analysis, &merge_config, NOFASTFORWARD_BRANCH); + analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); - cl_assert_equal_i(GIT_MERGE_CONFIG_FASTFORWARD_ONLY, (merge_config & GIT_MERGE_CONFIG_FASTFORWARD_ONLY)); + cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY)); } |