From 93efcad31777142840eaefc19b71d1a4b6a2fe24 Mon Sep 17 00:00:00 2001
From: Jacob Keller <jacob.keller@gmail.com>
Date: Mon, 17 Aug 2015 14:33:31 -0700
Subject: notes: extract parse_notes_merge_strategy to notes-utils
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
notes-utils.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
(limited to 'notes-utils.c')
diff --git a/notes-utils.c b/notes-utils.c
index ccbf0737a..299e34bcc 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -54,6 +54,24 @@ void commit_notes(struct notes_tree *t, const char *msg)
strbuf_release(&buf);
}
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s)
+{
+ if (!strcmp(v, "manual"))
+ *s = NOTES_MERGE_RESOLVE_MANUAL;
+ else if (!strcmp(v, "ours"))
+ *s = NOTES_MERGE_RESOLVE_OURS;
+ else if (!strcmp(v, "theirs"))
+ *s = NOTES_MERGE_RESOLVE_THEIRS;
+ else if (!strcmp(v, "union"))
+ *s = NOTES_MERGE_RESOLVE_UNION;
+ else if (!strcmp(v, "cat_sort_uniq"))
+ *s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
+ else
+ return -1;
+
+ return 0;
+}
+
static combine_notes_fn parse_combine_notes_fn(const char *v)
{
if (!strcasecmp(v, "overwrite"))
--
cgit v1.2.1