Merge branch 'rs/daemon-fixes' into maint

diff --git a/notes-merge.c b/notes-merge.c
index e804db2d02820c3ba762eebbbe7b465a487d83b8..fd5fae255d2760d6b7895e95cee627b5e28f776e 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -672,7 +672,7 @@ int notes_merge_commit(struct notes_merge_options *o,
        DIR *dir;
        struct dirent *e;
        struct strbuf path = STRBUF_INIT;
-       const char *buffer = get_commit_buffer(partial_commit);
+       const char *buffer = get_commit_buffer(partial_commit, NULL);
        const char *msg = strstr(buffer, "\n\n");
        int baselen;