[PATCH 03/18] odb_mkstemp: use git_path_buf
- From
Jeff King <peff@peff.net>
- Date
- Mar 28, 2017, 19:45 UTC
- Message-ID
- <20170328194551.w2y34j4kc2qd45vy@sigill.intra.peff.net>
- In-Reply-To
- <20170328194255.vf7nfzzmmzxsbn36@sigill.intra.peff.net>
Since git_path_buf() is smart enough to replace "objects/" with the correct object path, we can use it instead of manually assembling the path. That's slightly shorter, and will clean up any non-canonical bits in the path.
Signed-off-by: Jeff King <peff@peff.net> --- environment.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/environment.c b/environment.c index 88276790d..a9bf5658a 100644 --- a/environment.c +++ b/environment.c @@ -282,16 +282,14 @@ int odb_mkstemp(struct strbuf *template, const char *pattern) * restrictive except to remove write permission. */ int mode = 0444; - strbuf_reset(template); - strbuf_addf(template, "%s/%s", get_object_directory(), pattern); + git_path_buf(template, "objects/%s", pattern); fd = git_mkstemp_mode(template->buf, mode); if (0 <= fd) return fd; /* slow path */ /* some mkstemp implementations erase template on failure */ - strbuf_reset(template); - strbuf_addf(template, "%s/%s", get_object_directory(), pattern); + git_path_buf(template, "objects/%s", pattern); safe_create_leading_directories(template->buf); return xmkstemp_mode(template->buf, mode); }
-- 2.12.2.845.g55fcf8b10