grep: break down an "if" stmt in preparation for next changes

diff --git a/notes-utils.c b/notes-utils.c
index ccbf0737a34e466d39b2084c8a6d258b8235d8f6..24a33616a47737e6ae8cf917080cbb314dcf2762 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -37,7 +37,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
 
        if (!t)
                t = &default_notes_tree;
-       if (!t->initialized || !t->ref || !*t->ref)
+       if (!t->initialized || !t->update_ref || !*t->update_ref)
                die(_("Cannot commit uninitialized/unreferenced notes tree"));
        if (!t->dirty)
                return; /* don't have to commit an unchanged tree */
@@ -48,12 +48,30 @@ void commit_notes(struct notes_tree *t, const char *msg)
 
        create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
        strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
-       update_ref(buf.buf, t->ref, commit_sha1, NULL, 0,
+       update_ref(buf.buf, t->update_ref, commit_sha1, NULL, 0,
                   UPDATE_REFS_DIE_ON_ERR);
 
        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"))
@@ -130,7 +148,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
                free(c);
                return NULL;
        }
-       c->trees = load_notes_trees(c->refs);
+       c->trees = load_notes_trees(c->refs, NOTES_INIT_WRITABLE);
        string_list_clear(c->refs, 0);
        free(c->refs);
        return c;