X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=fb0832f97d218ecd1812361721800d6288935c06;hb=176158cabd2d369151a4122c59ed8afab0ca236c;hp=0d38a1b17d8399c7acf6355d598f0a50d0ec1d3b;hpb=48de6569eb1c4b0ab62e63b20c693fe3017171f2;p=git.git diff --git a/notes-merge.c b/notes-merge.c index 0d38a1b17..fb0832f97 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -551,7 +551,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents, /* else: t->ref points to nothing, assume root/orphan commit */ } - if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL)) + if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL, NULL)) die("Failed to commit notes tree to database"); }