Move GIT_MERGE_CONFIG_* to its own enum

1 files changed, 38 insertions, 31 deletions

diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c
index daa4e9dd8..d4cf587c4 100644
--- a/tests/merge/workdir/analysis.c
+++ b/tests/merge/workdir/analysis.c
@@ -36,71 +36,76 @@ void test_merge_workdir_analysis__cleanup(void)
 	cl_git_sandbox_cleanup();
 }
 
-static git_merge_analysis_t analysis_from_branch(const char *branchname)
+static void analysis_from_branch(
+	git_merge_analysis_t *merge_analysis,
+	git_merge_config_t *merge_config,
+	const char *branchname)
 {
 	git_buf refname = GIT_BUF_INIT;
 	git_reference *their_ref;
 	git_merge_head *their_head;
-	git_merge_analysis_t analysis;
 
 	git_buf_printf(&refname, "%s%s", GIT_REFS_HEADS_DIR, branchname);
 
 	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(&analysis, repo, (const git_merge_head **)&their_head, 1));
+	cl_git_pass(git_merge_analysis(merge_analysis, merge_config, repo, (const git_merge_head **)&their_head, 1));
 
 	git_buf_free(&refname);
 	git_merge_head_free(their_head);
 	git_reference_free(their_ref);
-
-	return analysis;
 }
 
 void test_merge_workdir_analysis__fastforward(void)
 {
-	git_merge_analysis_t analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
-	analysis = analysis_from_branch(FASTFORWARD_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (analysis & GIT_MERGE_ANALYSIS_NORMAL));
+	analysis_from_branch(&merge_analysis, &merge_config, 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));
 }
 
 void test_merge_workdir_analysis__no_fastforward(void)
 {
-	git_merge_analysis_t analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
-	analysis = analysis_from_branch(NOFASTFORWARD_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, analysis);
+	analysis_from_branch(&merge_analysis, &merge_config, NOFASTFORWARD_BRANCH);
+	cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
 }
 
 void test_merge_workdir_analysis__uptodate(void)
 {
-	git_merge_analysis_t analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
-	analysis = analysis_from_branch(UPTODATE_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, analysis);
+	analysis_from_branch(&merge_analysis, &merge_config, 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 analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
-	analysis = analysis_from_branch(PREVIOUS_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, analysis);
+	analysis_from_branch(&merge_analysis, &merge_config, 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 analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 	git_buf master = GIT_BUF_INIT;
 
 	git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master");
 	p_unlink(git_buf_cstr(&master));
 
-	analysis = analysis_from_branch(NOFASTFORWARD_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (analysis & GIT_MERGE_ANALYSIS_UNBORN));
+	analysis_from_branch(&merge_analysis, &merge_config, 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));
 
 	git_buf_free(&master);
 }
@@ -108,26 +113,28 @@ void test_merge_workdir_analysis__unborn(void)
 void test_merge_workdir_analysis__fastforward_with_config_noff(void)
 {
 	git_config *config;
-	git_merge_analysis_t analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
 	git_repository_config(&config, repo);
 	git_config_set_string(config, "merge.ff", "false");
 
-	analysis = analysis_from_branch(FASTFORWARD_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (analysis & GIT_MERGE_ANALYSIS_NORMAL));
-	cl_assert_equal_i(GIT_MERGE_CONFIG_NO_FASTFORWARD, (analysis & GIT_MERGE_CONFIG_NO_FASTFORWARD));
+	analysis_from_branch(&merge_analysis, &merge_config, 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));
 }
 
 void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void)
 {
 	git_config *config;
-	git_merge_analysis_t analysis;
+	git_merge_analysis_t merge_analysis;
+	git_merge_config_t merge_config;
 
 	git_repository_config(&config, repo);
 	git_config_set_string(config, "merge.ff", "only");
 
-	analysis = analysis_from_branch(NOFASTFORWARD_BRANCH);
-	cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (analysis & GIT_MERGE_ANALYSIS_NORMAL));
-	cl_assert_equal_i(GIT_MERGE_CONFIG_FASTFORWARD_ONLY, (analysis & GIT_MERGE_CONFIG_FASTFORWARD_ONLY));
+	analysis_from_branch(&merge_analysis, &merge_config, 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));
 }