get_sha1(): fix error status regression

diff --git a/notes-merge.h b/notes-merge.h
index aa756931a5720aab8526e4c9ba746113783b50ae..0c11b173a1e38ddeb702e022ebdd571ed2ad12f3 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -11,13 +11,14 @@ 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;
 };
@@ -36,7 +37,7 @@ void init_notes_merge_options(struct notes_merge_options *o);
  * 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);
+                        const struct strbuf *msg, unsigned char *result_sha1);
 
 /*
  * Merge notes from o->remote_ref into o->local_ref