commit_tree: take a pointer/len pair rather than a const strbuf

diff --git a/notes-merge.c b/notes-merge.c
index 94a1a8ae466733b207ae5030f8a8894d66535f91..9d942104d2156b1f05554d92c43a5a136fbac125 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -644,7 +644,8 @@ int notes_merge(struct notes_merge_options *o,
                struct commit_list *parents = NULL;
                commit_list_insert(remote, &parents); /* LIFO order */
                commit_list_insert(local, &parents);
-               create_notes_commit(local_tree, parents, &o->commit_msg,
+               create_notes_commit(local_tree, parents,
+                                   o->commit_msg.buf, o->commit_msg.len,
                                    result_sha1);
        }
 
@@ -720,7 +721,8 @@ int notes_merge_commit(struct notes_merge_options *o,
        }
 
        strbuf_attach(&sb_msg, msg, strlen(msg), strlen(msg) + 1);
-       create_notes_commit(partial_tree, partial_commit->parents, &sb_msg,
+       create_notes_commit(partial_tree, partial_commit->parents,
+                           sb_msg.buf, sb_msg.len,
                            result_sha1);
        if (o->verbosity >= 4)
                printf("Finalized notes merge commit: %s\n",