From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Derrick Stolee <derrickstolee@github.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 4/4] test: document broken merge.conflictStyle handling
Date: Wed, 10 May 2023 15:37:38 -0600 [thread overview]
Message-ID: <20230510213738.505241-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20230510213738.505241-1-felipe.contreras@gmail.com>
Currently both merge.conflictStyle and --conflict=diff3 don't work
together for `git commit --merge`, since the former wrongly overrides
the later.
There is no easy way to fix this, so mark it as broken for now.
Signee-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t6440-config-conflict-markers.sh | 31 ++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh
index c51512ced6..3ba993a6a8 100755
--- a/t/t6440-config-conflict-markers.sh
+++ b/t/t6440-config-conflict-markers.sh
@@ -82,4 +82,35 @@ test_expect_success 'notes' '
)
'
+test_expect_failure 'checkout' '
+ test_create_repo checkout &&
+ (
+ test_commit checkout &&
+
+ test_write_lines a b c d e >content &&
+ git add content &&
+ git commit -m initial &&
+
+ git checkout -b simple master &&
+ test_write_lines a c e >content &&
+ git commit -a -m simple &&
+
+ test_write_lines b d >content &&
+ git checkout --merge master &&
+ ! grep "^|||||||" content &&
+
+ git config merge.conflictstyle merge &&
+
+ git checkout -f simple &&
+ test_write_lines b d >content &&
+ git checkout --merge --conflict=diff3 master &&
+ grep "^|||||||" content &&
+
+ git checkout -f simple &&
+ test_write_lines b d >content &&
+ git checkout --merge --conflict=merge master &&
+ ! grep "^|||||||" content
+ )
+'
+
test_done
--
2.40.0+fc1
prev parent reply other threads:[~2023-05-10 21:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 21:37 [PATCH v3 0/4] Generic conflict style fixes Felipe Contreras
2023-05-10 21:37 ` [PATCH v3 1/4] test: add merge style config test Felipe Contreras
2023-05-10 21:37 ` [PATCH v3 2/4] merge-tree: fix merge.conflictstyle handling Felipe Contreras
2023-05-10 21:37 ` [PATCH v3 3/4] notes: " Felipe Contreras
2023-05-10 21:37 ` Felipe Contreras [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230510213738.505241-5-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).