summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-04-20 21:09:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-21 04:04:20 (GMT)
commit8c2ca3a6d6d0bf51332f92d25b7902f9943aaaf2 (patch)
tree239417b4ea3d79c3fb2561a6c28d8f367bb6508c /builtin/worktree.c
parentd9c69644b27eb59fe16c1931580e6fce4abbdc65 (diff)
downloadgit-8c2ca3a6d6d0bf51332f92d25b7902f9943aaaf2.zip
git-8c2ca3a6d6d0bf51332f92d25b7902f9943aaaf2.tar.gz
git-8c2ca3a6d6d0bf51332f92d25b7902f9943aaaf2.tar.bz2
replace strbuf_addstr(git_path()) with git_path_buf()
Writing directly into the strbuf avoids a useless copy of the data, and dropping calls to git_path() makes it easier to audit for dangerous calls. Note that git_path() does an implicit strbuf_reset(), but in each of these cases we were either already doing that reset, or writing into a fresh strbuf anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r--builtin/worktree.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 831fe05..9cceaf4 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -106,8 +106,7 @@ static void prune_worktrees(void)
printf("%s\n", reason.buf);
if (show_only)
continue;
- strbuf_reset(&path);
- strbuf_addstr(&path, git_path("worktrees/%s", d->d_name));
+ git_path_buf(&path, "worktrees/%s", d->d_name);
ret = remove_dir_recursively(&path, 0);
if (ret < 0 && errno == ENOTDIR)
ret = unlink(path.buf);
@@ -215,8 +214,7 @@ static int add_worktree(const char *path, const char *refname,
}
name = worktree_basename(path, &len);
- strbuf_addstr(&sb_repo,
- git_path("worktrees/%.*s", (int)(path + len - name), name));
+ git_path_buf(&sb_repo, "worktrees/%.*s", (int)(path + len - name), name);
len = sb_repo.len;
if (safe_create_leading_directories_const(sb_repo.buf))
die_errno(_("could not create leading directories of '%s'"),