apply: respect merge.conflictStyle in --3way

Denton-L · gitster · commit 091489d068e0 · 2019-10-24T11:32:53.000+09:00
Before, when doing a 3-way merge, the merge.conflictStyle option was not
respected and the "merge" style was always used, even if "diff3" was
specified.

Call git_xmerge_config() at the end of git_apply_config() so that the
merge.conflictStyle config is read.

Signed-off-by: Denton Liu &lt;liu.denton@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/apply.c b/apply.c
@@ -32,7 +32,7 @@ static void git_apply_config(void)
 {
 	git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
 	git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
-	git_config(git_default_config, NULL);
+	git_config(git_xmerge_config, NULL);
 }
 
 static int parse_whitespace_option(struct apply_state *state, const char *option)
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
@@ -73,7 +73,7 @@ test_expect_success 'apply with --3way' '
 	test_apply_with_3way
 '
 
-test_expect_failure 'apply with --3way with merge.conflictStyle = diff3' '
+test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '
 	test_config merge.conflictStyle diff3 &&
 	test_apply_with_3way
 '

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static void git_apply_config(void)`
`32`	`32`	`{`
`33`	`33`	`git_config_get_string_const("apply.whitespace", &apply_default_whitespace);`
`34`	`34`	`git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);`
`35`		`- git_config(git_default_config, NULL);`
	`35`	`+ git_config(git_xmerge_config, NULL);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`static int parse_whitespace_option(struct apply_state state, const char option)`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ test_expect_success 'apply with --3way' '`
`73`	`73`	`test_apply_with_3way`
`74`	`74`	`'`
`75`	`75`
`76`		`-test_expect_failure 'apply with --3way with merge.conflictStyle = diff3' '`
	`76`	`+test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '`
`77`	`77`	`test_config merge.conflictStyle diff3 &&`
`78`	`78`	`test_apply_with_3way`
`79`	`79`	`'`