summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-17 21:22:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-17 21:22:17 (GMT)
commit9f3f38769d49255d3fbf97f35a0dec591de17db3 (patch)
treed0b4e0ef5aab675c75932a5cf888c4f32397497f /builtin
parentcbecc168d4264d93295cd1e0a48dc19f0ed1880c (diff)
parent517b60564e2c69cbb79895e04b24a6393273398f (diff)
downloadgit-9f3f38769d49255d3fbf97f35a0dec591de17db3.zip
git-9f3f38769d49255d3fbf97f35a0dec591de17db3.tar.gz
git-9f3f38769d49255d3fbf97f35a0dec591de17db3.tar.bz2
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')
-rw-r--r--builtin/checkout.c2
-rw-r--r--builtin/notes.c4
-rw-r--r--builtin/sparse-checkout.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index fc2eb1b..d677381 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -865,7 +865,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
strbuf_addf(&msg, "checkout: moving from %s to %s",
old_desc ? old_desc : "(invalid)", new_branch_info->name);
else
- strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
+ strbuf_insertstr(&msg, 0, reflog_msg);
if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) {
/* Nothing to do. */
diff --git a/builtin/notes.c b/builtin/notes.c
index 95456f3..35e468e 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);
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 7aeb384..571fed4 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -398,7 +398,7 @@ static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl)
return;
if (line->buf[0] != '/')
- strbuf_insert(line, 0, "/", 1);
+ strbuf_insertstr(line, 0, "/");
insert_recursive_pattern(pl, line);
}