[PATCH v2 07/19] builtin/checkout: simplify via strbuf_set()
flat view
STALE3769d
From: Jeremiah Mahler <hidden>
Date: 2016-06-15 23:01:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
Simplify cases where a strbuf_reset is immediately followed by a strbuf_add by using strbuf_set operations. Signed-off-by: Jeremiah Mahler <redacted> --- builtin/checkout.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9cbe7d1..38fc0ce 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c@@ -912,8 +912,7 @@ static int prepare_linked_checkout(const struct checkout_opts *opts, sb_git.buf); junk_work_tree = path; - strbuf_reset(&sb); - strbuf_addf(&sb, "%s/gitdir", sb_repo.buf); + strbuf_setf(&sb, "%s/gitdir", sb_repo.buf); write_file(sb.buf, 1, "%s\n", real_path(sb_git.buf)); write_file(sb_git.buf, 1, "gitdir: %s/repos/%s\n", real_path(get_git_common_dir()), name);
@@ -923,11 +922,9 @@ static int prepare_linked_checkout(const struct checkout_opts *opts, * value would do because this value will be ignored and * replaced at the next (real) checkout. */ - strbuf_reset(&sb); - strbuf_addf(&sb, "%s/HEAD", sb_repo.buf); + strbuf_setf(&sb, "%s/HEAD", sb_repo.buf); write_file(sb.buf, 1, "%s\n", sha1_to_hex(new->commit->object.sha1)); - strbuf_reset(&sb); - strbuf_addf(&sb, "%s/commondir", sb_repo.buf); + strbuf_setf(&sb, "%s/commondir", sb_repo.buf); write_file(sb.buf, 1, "../..\n"); if (!opts->quiet)
@@ -942,8 +939,7 @@ static int prepare_linked_checkout(const struct checkout_opts *opts, ret = run_command(&cp); if (!ret) is_junk = 0; - strbuf_reset(&sb); - strbuf_addf(&sb, "%s/locked", sb_repo.buf); + strbuf_setf(&sb, "%s/locked", sb_repo.buf); unlink_or_warn(sb.buf); strbuf_release(&sb); strbuf_release(&sb_repo);
@@ -1048,8 +1044,7 @@ static void check_linked_checkouts(struct branch_info *new) return; } - strbuf_reset(&path); - strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); + strbuf_setf(&path, "%s/HEAD", get_git_common_dir()); /* * $GIT_COMMON_DIR/HEAD is practically outside * $GIT_DIR so resolve_ref_unsafe() won't work (it
@@ -1064,8 +1059,7 @@ static void check_linked_checkouts(struct branch_info *new) while ((d = readdir(dir)) != NULL) { if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue; - strbuf_reset(&path); - strbuf_addf(&path, "%s/repos/%s/HEAD", + strbuf_setf(&path, "%s/repos/%s/HEAD", get_git_common_dir(), d->d_name); if (check_linked_checkout(new, d->d_name, path.buf)) break;
--
2.0.0.592.gf55b190