git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 5/5] apply: respect merge.conflictStyle in --3way
Date: Thu, 24 Oct 2019 10:20:25 +0900	[thread overview]
Message-ID: <xmqqo8y7gcrq.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <56c31310db9358673af9905910e3332893d798de.1571832177.git.liu.denton@gmail.com> (Denton Liu's message of "Wed, 23 Oct 2019 05:03:58 -0700")

Denton Liu <liu.denton@gmail.com> writes:

> 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.

>  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 &&

  reply	other threads:[~2019-10-24  1:20 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23 12:03 [PATCH 0/5] apply: fix merge.conflictStyle bug in --3way Denton Liu
2019-10-23 12:03 ` [PATCH 1/5] t4108: replace create_file with test_write_lines Denton Liu
2019-10-23 12:03 ` [PATCH 2/5] t4108: remove git command upstream of pipe Denton Liu
2019-10-23 13:32   ` Eric Sunshine
2019-10-23 17:11     ` Denton Liu
2019-10-23 12:03 ` [PATCH 3/5] t4108: use `test_config` instead of `git config` Denton Liu
2019-10-23 12:03 ` [PATCH 4/5] t4108: demonstrate bug in apply Denton Liu
2019-10-23 13:40   ` Eric Sunshine
2019-10-23 12:03 ` [PATCH 5/5] apply: respect merge.conflictStyle in --3way Denton Liu
2019-10-24  1:20   ` Junio C Hamano [this message]
2019-10-23 23:32 ` [PATCH v2 0/5] This fixes a bug where even if `merge.conflictStyle = diff3`, running `git apply --3way` would not output the base Denton Liu
2019-10-23 23:32   ` [PATCH v2 1/5] t4108: replace create_file with test_write_lines Denton Liu
2019-10-23 23:32   ` [PATCH v2 2/5] t4108: remove git command upstream of pipe Denton Liu
2019-10-23 23:32   ` [PATCH v2 3/5] t4108: use `test_config` instead of `git config` Denton Liu
2019-10-23 23:32   ` [PATCH v2 4/5] t4108: demonstrate bug in apply Denton Liu
2019-10-23 23:32   ` [PATCH v2 5/5] apply: respect merge.conflictStyle in --3way Denton Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqo8y7gcrq.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=liu.denton@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).