ident.c: add split_ident_line() to parse formatted ident line

diff --git a/notes-merge.c b/notes-merge.c
index 0d38a1b17d8399c7acf6355d598f0a50d0ec1d3b..fb0832f97d218ecd1812361721800d6288935c06 100644 (file)
--- 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");
 }