From: Jacob Keller <jacob.keller@xxxxxxxxx>
Add new option "notes.<ref>.mergestrategy" option which specifies the merge
strategy for merging into a given notes ref. This option enables
selection of merge strategy for particular notes refs, rather than all
notes ref merges, as user may not want cat_sort_uniq for all refs, but
only some. Note that the <ref> is the local reference we are merging
into, not the remote ref we merged from. The assumption is that users
will mostly want to configure separate local ref merge strategies rather
than strategies depending on which remote ref they merge from. Also,
notes.<ref>.merge overrides the general behavior as it is more specific.
Signed-off-by: Jacob Keller <jacob.keller@xxxxxxxxx>
---
Documentation/config.txt | 7 +++++++
Documentation/git-notes.txt | 6 ++++++
builtin/notes.c | 13 ++++++++++---
t/t3309-notes-merge-auto-resolve.sh | 39 +++++++++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5e3e03459de7..47478311367e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1926,6 +1926,13 @@ notes.mergestrategy::
STRATEGIES" section of linkgit:git-notes[1] for more information
on each strategy.
+notes.<localref>.mergestrategy::
+ Which merge strategy to choose if the local ref for a notes merge
+ matches <localref>, overriding "notes.mergestrategy". <localref> must
+ be the short name of a ref under refs/notes/. See "NOTES MERGE
+ STRATEGIES" section in linkgit:git-notes[1] for more information on the
+ available strategies.
+
notes.displayRef::
The (fully qualified) refname from which to show notes when
showing commit messages. The value of this variable can be set
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 89c8829a0543..b99809fc81a6 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -322,6 +322,12 @@ notes.mergestrategy::
+
This setting can be overridden by passing the `--strategy` option.
+notes.<localref>.mergestrategy::
+ Which strategy to choose when merging into <localref>. The set of
+ allowed values is the same as "notes.mergestrategy". <localref> must be
+ the short name of a ref under refs/notes/. See "NOTES MERGE STRATEGIES"
+ section above for more information about each strategy.
+
notes.displayRef::
Which ref (or refs, if a glob or specified more than once), in
addition to the default set by `core.notesRef` or
diff --git a/builtin/notes.c b/builtin/notes.c
index 97109f8d419c..00c9ae402bab 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -758,13 +758,13 @@ static int parse_notes_strategy(const char *arg, enum notes_merge_strategy *stra
static int merge(int argc, const char **argv, const char *prefix)
{
- struct strbuf remote_ref = STRBUF_INIT, msg = STRBUF_INIT;
+ struct strbuf remote_ref = STRBUF_INIT, msg = STRBUF_INIT, merge_key = STRBUF_INIT;
unsigned char result_sha1[20];
struct notes_tree *t;
struct notes_merge_options o;
int do_merge = 0, do_commit = 0, do_abort = 0;
int verbosity = 0, result;
- const char *strategy = NULL, *configured_strategy = NULL;
+ const char *strategy = NULL, *configured_strategy = NULL, *short_ref = NULL;
struct option options[] = {
OPT_GROUP(N_("General options")),
OPT__VERBOSITY(&verbosity),
@@ -814,7 +814,14 @@ static int merge(int argc, const char **argv, const char *prefix)
expand_notes_ref(&remote_ref);
o.remote_ref = remote_ref.buf;
- git_config_get_string_const("notes.mergestrategy", &configured_strategy);
+ if (!skip_prefix(o.local_ref, "refs/notes/", &short_ref))
+ die("Refusing to merge notes into %s (outside of refs/notes/)",
+ o.local_ref);
+
+ strbuf_addf(&merge_key, "notes.%s.mergestrategy", short_ref);
+
+ if (git_config_get_string_const(merge_key.buf, &configured_strategy))
+ git_config_get_string_const("notes.mergestrategy", &configured_strategy);
if (strategy) {
if (parse_notes_strategy(strategy, &o.strategy)) {
diff --git a/t/t3309-notes-merge-auto-resolve.sh b/t/t3309-notes-merge-auto-resolve.sh
index 476b9f5306f1..560e75259798 100755
--- a/t/t3309-notes-merge-auto-resolve.sh
+++ b/t/t3309-notes-merge-auto-resolve.sh
@@ -383,6 +383,17 @@ test_expect_success 'reset to pre-merge state (y)' '
verify_notes y y
'
+test_expect_success 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge' '
+ git -c notes.y.mergestrategy="ours" notes merge z &&
+ verify_notes y ours
+'
+
+test_expect_success 'reset to pre-merge state (y)' '
+ git update-ref refs/notes/y refs/notes/y^1 &&
+ # Verify pre-merge state
+ verify_notes y y
+'
+
cat <<EOF | sort >expect_notes_theirs
9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15
5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
@@ -534,6 +545,34 @@ test_expect_success 'reset to pre-merge state (y)' '
verify_notes y y
'
+test_expect_success 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge' '
+ git -c notes.y.mergestrategy="theirs" notes merge --strategy=union z &&
+ verify_notes y union
+'
+
+test_expect_success 'reset to pre-merge state (y)' '
+ git update-ref refs/notes/y refs/notes/y^1 &&
+ # Verify pre-merge state
+ verify_notes y y
+'
+
+test_expect_success 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge' '
+ git -c notes.y.mergestrategy="union" -c notes.mergestrategy="theirs" notes merge z &&
+ verify_notes y union
+'
+
+test_expect_success 'reset to pre-merge state (y)' '
+ git update-ref refs/notes/y refs/notes/y^1 &&
+ # Verify pre-merge state
+ verify_notes y y
+'
+
+test_expect_success 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge' '
+ test_must_fail git -c notes.z.mergestrategy="union" notes merge z &&
+ git notes merge --abort &&
+ verify_notes y y
+'
+
cat <<EOF | sort >expect_notes_union2
d682107b8bf7a7aea1e537a8d5cb6a12b60135f1 $commit_sha15
5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
--
2.5.0.280.g4aaba03
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html