git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 5/5] apply: respect merge.conflictStyle in --3way

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 24, 2019, 01:20 UTC
Message-ID
<xmqqo8y7gcrq.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<56c31310db9358673af9905910e3332893d798de.1571832177.git.liu.denton@gmail.com>
Denton Liu <liu.denton@gmail.com> writes:
Show 12 quoted lines
> 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(-)
Interesting.

I do not recall why I did not add this when I introduced the "diff3" style. If it were because I knew other parts of "git apply" were not prepared to see the common ancestor hunk and using the "diff3" style would have triggered breakage in them, I would remember, so hopefully there is no subtle and hidden gotchas like it.

The implementation to trigger the "diff3" style conflict presentation obviously is correct ;-)

Thanks.
Show 6 quoted lines
>  test_apply_with_3way success default true
> -test_apply_with_3way failure 'merge.conflictStyle = diff3' 'test_config merge.conflictStyle diff3'
> +test_apply_with_3way success 'merge.conflictStyle = diff3' 'test_config merge.conflictStyle diff3'
>  
>  test_expect_success 'apply with --3way with rerere enabled' '
>  	test_config rerere.enabled true &&
Previous: Denton LiuNext: Denton Liu
Message 10 of 16 in “apply: fix merge.conflictStyle bug in --3way”
  1. 0/5 apply: fix merge.conflictStyle bug in --3wayDenton Liu, Oct 23, 2019
  2. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  3. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  4. Eric SunshineOct 23, 2019
  5. Denton LiuOct 23, 2019
  6. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  7. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  8. Eric SunshineOct 23, 2019
  9. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019
  10. Junio C HamanoOct 24, 2019
  11. 0/5 This fixes a bug where even if `merge.conflictStyle = diff3`, running `git apply --3way` would not output the base.Denton Liu, Oct 23, 2019
  12. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  13. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  14. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  15. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  16. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.