Merge branch 'ab/merge-file-prefix' into maint

diff --git a/notes-utils.c b/notes-utils.c
index b64dc1b0219928ac149894c99a63dcc9fd419668..ccbf0737a34e466d39b2084c8a6d258b8235d8f6 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -44,8 +44,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
 
        /* Prepare commit message and reflog message */
        strbuf_addstr(&buf, msg);
-       if (buf.buf[buf.len - 1] != '\n')
-               strbuf_addch(&buf, '\n'); /* Make sure msg ends with newline */
+       strbuf_complete_line(&buf);
 
        create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
        strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */