@matheusbsbs / matheus-bagliano / commits / 51861340f8

repack: fix generating multi-pack-index with only non-local packs

When writing the multi-pack-index with geometric repacking we will add all packfiles to the index that are part of the geometric sequence. This can potentially also include packfiles borrowed from an alternate object directory. But given that a multi-pack-index can only ever include packs that are part of the main object database this does not make much sense whatsoever. In the edge case where all packfiles are contained in the alternate object database and the local repository has none itself this bug can cause us to invoke git-multi-pack-index(1) with only non-local packfiles that it ultimately cannot find. This causes it to return an error and thus causes the geometric repack to fail. Fix the code to skip non-local packfiles. Co-authored-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Apr 14, 2023 at 08:01 UTC 51861340f8d7f76a99e0d7265f4417b0a9a6871c
2 files changed +34
builtin/repack.c
+11
@@ -570,6 +570,17 @@ static void midx_included_packs(struct string_list *include,
570 for (i = geometry->split; i < geometry->pack_nr; i++) {
571 struct packed_git *p = geometry->pack[i];
572
573 + /*
574 + * The multi-pack index never refers to packfiles part
575 + * of an alternate object database, so we skip these.
576 + * While git-multi-pack-index(1) would silently ignore
577 + * them anyway, this allows us to skip executing the
578 + * command completely when we have only non-local
579 + * packfiles.
580 + */
581 + if (!p->pack_local)
582 + continue;
583 +
584 strbuf_addstr(&buf, pack_basename(p));
585 strbuf_strip_suffix(&buf, ".pack");
586 strbuf_addstr(&buf, ".idx");
t/t7703-repack-geometric.sh
+23
@@ -313,4 +313,27 @@ test_expect_success '--geometric --write-midx with packfiles in main and alterna
313 test_cmp expect actual
314 '
315
316 +test_expect_success '--geometric --with-midx with no local objects' '
317 + test_when_finished "rm -fr shared member" &&
318 +
319 + # Create a repository with a single packfile that acts as alternate
320 + # object database.
321 + git init shared &&
322 + test_commit -C shared "shared-objects" &&
323 + git -C shared repack -ad &&
324 +
325 + # Create a second repository linked to the first one and perform a
326 + # geometric repack on it.
327 + git clone --shared shared member &&
328 + git -C member repack --geometric 2 --write-midx 2>err &&
329 + test_must_be_empty err &&
330 +
331 + # Assert that we wrote neither a new packfile nor a multi-pack-index.
332 + # We should not have a packfile because the single packfile in the
333 + # alternate object database does not invalidate the geometric sequence.
334 + # And we should not have a multi-pack-index because these only index
335 + # local packfiles, and there are none.
336 + test_dir_is_empty member/$packdir
337 +'
338 +
339 test_done