test "commit -S" and "log --show-signature"

diff --git a/notes-merge.c b/notes-merge.c
index e9e41993117ae03ed7c9d1f28081a42b2eee97ca..61cf18eeab6b36535c7f84e88300a91143a2bad8 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -546,7 +546,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");
 }