[PATCH 3/4] midx.c: lookup MIDX by object directory during repack
From: Taylor Blau <hidden>
Date: 2021-10-08 21:46:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
Apply similar treatment as in the last commit to the MIDX `repack` operation. Signed-off-by: Taylor Blau <redacted> --- midx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/midx.c b/midx.c
index 7f1addf4b6..137af3fc67 100644
--- a/midx.c
+++ b/midx.c@@ -1872,7 +1872,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, struct child_process cmd = CHILD_PROCESS_INIT; FILE *cmd_in; struct strbuf base_name = STRBUF_INIT; - struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); + struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir); /* * When updating the default for these configuration
@@ -1944,11 +1944,8 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, } result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags); - m = NULL; cleanup: - if (m) - close_midx(m); free(include_pack); return result; }
--
2.33.0.96.g73915697e6