summaryrefslogtreecommitdiff
path: root/notes-utils.c
diff options
context:
space:
mode:
authorJacob Keller <jacob.keller@gmail.com>2015-08-17 14:33:31 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-17 15:38:32 -0700
commit93efcad31777142840eaefc19b71d1a4b6a2fe24 (patch)
tree079224bbe9ff6a56888bc15f500053b1744febed /notes-utils.c
parent4d03dd18f0860d4052fab5ce7779e4bba302e5fc (diff)
downloadgit-93efcad31777142840eaefc19b71d1a4b6a2fe24.tar.gz
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>
Diffstat (limited to 'notes-utils.c')
-rw-r--r--notes-utils.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/notes-utils.c b/notes-utils.c
index ccbf0737a3..299e34bccc 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"))