diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
| commit | f35ccd9be2db9a55afd09ed1a9338c758fa63d82 (patch) | |
| tree | c94f3c518cdadb2c478e066547f152d3c753fb36 /builtin/notes.c | |
| parent | 52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d (diff) | |
| parent | 37576c14439a4dfa43bec5a5c953fea1cc436bbf (diff) | |
| download | git-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.tar.gz | |
Merge branch 'nd/war-on-nul-in-commit'
* nd/war-on-nul-in-commit:
commit_tree(): refuse commit messages that contain NULs
Convert commit_tree() to take strbuf as message
merge: abort if fails to commit
Conflicts:
builtin/commit.c
commit.c
commit.h
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 667e20a1e1..3644d140ec 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); |