diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-12-15 20:47:22 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-15 10:46:42 -0800 |
| commit | 13f8b72d8c8e24215a3dd7771592b30083f1c740 (patch) | |
| tree | 090da017d258dc9d29af8c270d287f61d44b150a /builtin/notes.c | |
| parent | 6b3c4c05475d206fafd650d8d27c82a8b051ac30 (diff) | |
| download | git-13f8b72d8c8e24215a3dd7771592b30083f1c740.tar.gz git-13f8b72d8c8e24215a3dd7771592b30083f1c740.tar.xz | |
Convert commit_tree() to take strbuf as message
There wan't a way for commit_tree() to notice if the message the caller
prepared contained a NUL byte, as it did not take the length of the
message as a parameter. Use a pointer to a strbuf instead, so that we can
either choose to allow low-level plumbing commands to make commits that
contain NUL byte in its message, or forbid NUL everywhere by adding the
check in commit_tree(), in later patches.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index f8e437db0..5e32548cd 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -301,12 +301,12 @@ void commit_notes(struct notes_tree *t, const char *msg) return; /* don't have to commit an unchanged tree */ /* Prepare commit message and reflog message */ - strbuf_addstr(&buf, "notes: "); /* commit message starts at index 7 */ strbuf_addstr(&buf, msg); if (buf.buf[buf.len - 1] != '\n') strbuf_addch(&buf, '\n'); /* Make sure msg ends with newline */ - create_notes_commit(t, NULL, buf.buf + 7, commit_sha1); + create_notes_commit(t, NULL, &buf, commit_sha1); + strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */ update_ref(buf.buf, t->ref, commit_sha1, NULL, 0, DIE_ON_ERR); strbuf_release(&buf); |