[PATCH v2 5/5] apply: respect merge.conflictStyle in --3way
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Oct 23, 2019, 23:32 UTC
- Message-ID
- <5412dc9153d10c4f7769b24433b05c6809904655.1571873435.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1571873435.git.liu.denton@gmail.com>
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 <liu.denton@gmail.com> --- apply.c | 2 +- t/t4108-apply-threeway.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apply.c b/apply.c index f8a046a6a5..b9291f5f7b 100644 --- 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 index bffe37f1ba..d7349ced6b 100755 --- 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 '
-- 2.24.0.rc0.197.g0926ab8072