On Sun, Mar 24, 2024 at 05:40:00PM +0100, René Scharfe wrote: > 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 <l.s.r@xxxxxx> This patch looks obviously good to me, so please feel free to add my Reviewed-by. Thanks! Patrick > --- > midx.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > 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; > > -- > 2.44.0 >
Attachment:
signature.asc
Description: PGP signature
