From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 3/4] notes: fix merge.conflictstyle handling
Date: Mon, 21 Jun 2021 19:27:13 -0500 [thread overview]
Message-ID: <20210622002714.1720891-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210622002714.1720891-1-felipe.contreras@gmail.com>
Currently it's completely ignored.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/notes.c | 3 ++-
t/t6440-config-conflict-markers.sh | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 74bba39ca8..a333cc68ec 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -23,6 +23,7 @@
#include "notes-merge.h"
#include "notes-utils.h"
#include "worktree.h"
+#include "xdiff-interface.h"
static const char * const git_notes_usage[] = {
N_("git notes [--ref <notes-ref>] [list [<object>]]"),
@@ -1000,7 +1001,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix)
OPT_END()
};
- git_config(git_default_config, NULL);
+ git_config(git_xmerge_config, NULL);
argc = parse_options(argc, argv, prefix, options, git_notes_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh
index cb2ee3ad0a..c51512ced6 100755
--- a/t/t6440-config-conflict-markers.sh
+++ b/t/t6440-config-conflict-markers.sh
@@ -55,4 +55,31 @@ test_expect_success 'merge-tree' '
)
'
+test_expect_success 'notes' '
+ test_create_repo notes &&
+ (
+ test_commit initial &&
+
+ git -c core.notesRef=refs/notes/b notes add -m b initial &&
+
+ git update-ref refs/notes/r refs/notes/b &&
+ git -c core.notesRef=refs/notes/r notes add -f -m r initial &&
+
+ git update-ref refs/notes/l refs/notes/b &&
+ git config core.notesRef refs/notes/l &&
+ git notes add -f -m l initial &&
+
+ test_must_fail git notes merge r &&
+ ! grep "^|||||||" .git/NOTES_MERGE_WORKTREE/* &&
+
+ git notes merge --abort &&
+ test_must_fail git -c merge.conflictstyle=diff3 notes merge r &&
+ grep "^|||||||" .git/NOTES_MERGE_WORKTREE/* &&
+
+ git notes merge --abort &&
+ test_must_fail git -c merge.conflictstyle=merge notes merge r &&
+ ! grep "^|||||||" .git/NOTES_MERGE_WORKTREE/*
+ )
+'
+
test_done
--
2.32.0
next prev parent reply other threads:[~2021-06-22 0:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 0:27 [PATCH v2 0/4] Generic conflict style fixes Felipe Contreras
2021-06-22 0:27 ` [PATCH v2 1/4] test: add merge style config test Felipe Contreras
2021-06-22 0:27 ` [PATCH v2 2/4] merge-tree: fix merge.conflictstyle handling Felipe Contreras
2021-06-22 0:27 ` Felipe Contreras [this message]
2021-06-22 0:27 ` [PATCH v2 4/4] test: document broken merge.conflictStyle handling Felipe Contreras
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=20210622002714.1720891-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.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).