From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/5] apply: fix merge.conflictStyle bug in --3way
Date: Wed, 23 Oct 2019 05:03:44 -0700 [thread overview]
Message-ID: <cover.1571832176.git.liu.denton@gmail.com> (raw)
This fixes a bug where even if `merge.conflictStyle = diff3`, running
`git apply --3way` would not output the base.
Patches 1-3 are general cleanup for t4108, 4 demonstrates the bug and 5
actually fixes it.
Denton Liu (5):
t4108: replace create_file with test_write_lines
t4108: remove git command upstream of pipe
t4108: use `test_config` instead of `git config`
t4108: demonstrate bug in apply
apply: respect merge.conflictStyle in --3way
apply.c | 2 +-
t/t4108-apply-threeway.sh | 96 +++++++++++++++++++++------------------
2 files changed, 53 insertions(+), 45 deletions(-)
--
2.24.0.rc0.197.g0926ab8072
next reply other threads:[~2019-10-23 12:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 12:03 Denton Liu [this message]
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
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=cover.1571832176.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.