diff options
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 94a1a8ae46..9d942104d2 100644 --- 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", |