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>

diff --git a/builtin/notes.c b/builtin/notes.c
index 63f95fc55439060670879fd987033000b8ba3401..29816f9fbba284bca363b1e0c641399a313374a4 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -796,17 +796,7 @@ static int merge(int argc, const char **argv, const char *prefix)
        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);
                }

diff --git a/notes-utils.c b/notes-utils.c
index ccbf0737a34e466d39b2084c8a6d258b8235d8f6..299e34bccc5893529cb5db1abe061529304e6074 100644 (file)
--- 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"))

diff --git a/notes-utils.h b/notes-utils.h
index db5811e3f718e0dce7bc31e92cd05e481fe4376a..fa538e1d9502c07fb1d72901c5939cd276fa1722 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -37,6 +37,7 @@ struct notes_rewrite_cfg {
        int mode_from_env;
 };
 
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
                          const unsigned char *from_obj, const unsigned char *to_obj);