refs.c: allow listing and deleting badly named refs

diff --git a/notes-merge.h b/notes-merge.h
index aa756931a5720aab8526e4c9ba746113783b50ae..1d01f6aacf54b27a498d6071b5ec80fee5c35a47 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -11,33 +11,20 @@ enum notes_merge_verbosity {
 struct notes_merge_options {
        const char *local_ref;
        const char *remote_ref;
-       const char *commit_msg;
+       struct strbuf commit_msg;
        int verbosity;
        enum {
                NOTES_MERGE_RESOLVE_MANUAL = 0,
                NOTES_MERGE_RESOLVE_OURS,
                NOTES_MERGE_RESOLVE_THEIRS,
-               NOTES_MERGE_RESOLVE_UNION
+               NOTES_MERGE_RESOLVE_UNION,
+               NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
        } strategy;
        unsigned has_worktree:1;
 };
 
 void init_notes_merge_options(struct notes_merge_options *o);
 
-/*
- * Create new notes commit from the given notes tree
- *
- * Properties of the created commit:
- * - tree: the result of converting t to a tree object with write_notes_tree().
- * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
- * - author/committer: the default determined by commmit_tree().
- * - commit message: msg
- *
- * The resulting commit SHA1 is stored in result_sha1.
- */
-void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
-                        const char *msg, unsigned char *result_sha1);
-
 /*
  * Merge notes from o->remote_ref into o->local_ref
  *