commit 93efcad31777142840eaefc19b71d1a4b6a2fe24
author Jacob Keller <jacob.keller@gmail.com> Mon Aug 17 14:33:31 2015 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Aug 17 15:38:32 2015 -0700
tree 079224bbe9ff6a56888bc15f500053b1744febed
parent 4d03dd18f0860d4052fab5ce7779e4bba302e5fc

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>

builtin/notes.c

diff --git a/builtin/notes.c b/builtin/notes.c
index 63f95fc..29816f9 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -796,17 +796,7 @@
 	o.remote_ref = remote_ref.buf;
 
 	if (strategy) {
-		if (!strcmp(strategy, "manual"))
-			o.strategy = NOTES_MERGE_RESOLVE_MANUAL;
-		else if (!strcmp(strategy, "ours"))
-			o.strategy = NOTES_MERGE_RESOLVE_OURS;
-		else if (!strcmp(strategy, "theirs"))
-			o.strategy = NOTES_MERGE_RESOLVE_THEIRS;
-		else if (!strcmp(strategy, "union"))
-			o.strategy = NOTES_MERGE_RESOLVE_UNION;
-		else if (!strcmp(strategy, "cat_sort_uniq"))
-			o.strategy = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
-		else {
+		if (parse_notes_merge_strategy(strategy, &o.strategy)) {
 			error("Unknown -s/--strategy: %s", strategy);
 			usage_with_options(git_notes_merge_usage, options);
 		}