From: Taylor Blau <me@ttaylorr.com>
Date: Fri, 8 Oct 2021 21:46:35 +0000 (-0400)
Subject: midx.c: lookup MIDX by object directory during repack
X-Git-Tag: v2.34.0-rc0~26^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0f1f9dec4457ffecf9e087665e6eb28da19c18f;p=thirdparty%2Fgit.git

midx.c: lookup MIDX by object directory during repack

Apply similar treatment as in the last commit to the MIDX `repack`
operation.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/midx.c b/midx.c
index 053279bef3..f2c976051d 100644
--- a/midx.c
+++ b/midx.c
@@ -1861,7 +1861,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
@@ -1933,11 +1933,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;
 }