diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
| commit | 9f3f38769d49255d3fbf97f35a0dec591de17db3 (patch) | |
| tree | d0b4e0ef5aab675c75932a5cf888c4f32397497f /builtin/notes.c | |
| parent | Merge branch 'rs/parse-options-concat-dup' (diff) | |
| parent | mailinfo: don't insert header prefix for handle_content_type() (diff) | |
| download | git-9f3f38769d49255d3fbf97f35a0dec591de17db3.tar.gz git-9f3f38769d49255d3fbf97f35a0dec591de17db3.zip | |
Merge branch 'rs/strbuf-insertstr'
Code clean-up.
* rs/strbuf-insertstr:
mailinfo: don't insert header prefix for handle_content_type()
strbuf: add and use strbuf_insertstr()
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 95456f3165..35e468ea2d 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -622,7 +622,7 @@ static int append_edit(int argc, const char **argv, const char *prefix) strbuf_grow(&d.buf, size + 1); if (d.buf.len && prev_buf && size) - strbuf_insert(&d.buf, 0, "\n", 1); + strbuf_insertstr(&d.buf, 0, "\n"); if (prev_buf && size) strbuf_insert(&d.buf, 0, prev_buf, size); free(prev_buf); @@ -745,7 +745,7 @@ static int merge_commit(struct notes_merge_options *o) memset(&pretty_ctx, 0, sizeof(pretty_ctx)); format_commit_message(partial, "%s", &msg, &pretty_ctx); strbuf_trim(&msg); - strbuf_insert(&msg, 0, "notes: ", 7); + strbuf_insertstr(&msg, 0, "notes: "); update_ref(msg.buf, o->local_ref, &oid, is_null_oid(&parent_oid) ? NULL : &parent_oid, 0, UPDATE_REFS_DIE_ON_ERR); |