From: René Scharfe Date: Sun, 24 Mar 2024 16:40:00 +0000 (+0100) Subject: midx: use strvec_pushf() for pack-objects base name X-Git-Tag: v2.45.0-rc0~53^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d45e79e115ef3259179032367cb84d08198c6c5;p=thirdparty%2Fgit.git midx: use strvec_pushf() for pack-objects base name Build the pack base name argument directly using strvec_pushf() instead of with an intermediate strbuf. This is shorter, simpler and avoids the need for explicit cleanup. Signed-off-by: René Scharfe Reviewed-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- diff --git a/midx.c b/midx.c index 85e1c2cd12..41521e019c 100644 --- a/midx.c +++ b/midx.c @@ -2163,7 +2163,6 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned char *include_pack; struct child_process cmd = CHILD_PROCESS_INIT; FILE *cmd_in; - struct strbuf base_name = STRBUF_INIT; struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir); /* @@ -2190,9 +2189,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, strvec_push(&cmd.args, "pack-objects"); - strbuf_addstr(&base_name, object_dir); - strbuf_addstr(&base_name, "/pack/pack"); - strvec_push(&cmd.args, base_name.buf); + strvec_pushf(&cmd.args, "%s/pack/pack", object_dir); if (delta_base_offset) strvec_push(&cmd.args, "--delta-base-offset"); @@ -2204,8 +2201,6 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, else strvec_push(&cmd.args, "-q"); - strbuf_release(&base_name); - cmd.git_cmd = 1; cmd.in = cmd.out = -1;