diff options
| author |   Denton Liu <liu.denton@gmail.com> | 2019-10-23 16:32:38 -0700 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2019-10-24 11:32:53 +0900 |
| commit | 091489d068e0e812123f5114149bdb0e7d74c257 (patch) | |
| tree | e3a909bb6301b162f455b2bd279caa839f512b2a | |
| parent | t4108: demonstrate bug in apply (diff) | |
| download | git-091489d068e0e812123f5114149bdb0e7d74c257.tar.xz git-091489d068e0e812123f5114149bdb0e7d74c257.zip | |
apply: respect merge.conflictStyle in --3way
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | apply.c | 2 | ||||
| -rwxr-xr-x | t/t4108-apply-threeway.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 bffe37f1baa..d7349ced6be 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 ' |