зеркало из https://github.com/microsoft/git.git
Merge branch 'rs/midx-use-strvec-pushf'
Code clean-up. * rs/midx-use-strvec-pushf: midx: use strvec_pushf() for pack-objects base name
This commit is contained in:
Коммит
f046355ec3
7
midx.c
7
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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче