@matheusbsbs / matheus-bagliano / commits / 4bb086cfa2

maintenance(geometric): do release the `.idx` files before repacking

As is done for all the other maintenance tasks, let's release the ODB also before starting the geometric repacking. That way, the `.idx` files won't be `mmap()`ed when they are to be deleted (which does not work on Windows because you cannot delete files on that platform as long as they are kept open by a process). This regression was introduced by 9bc151850c1c (builtin/maintenance: introduce "geometric-repack" task, 2025-10-24), but was only noticed once geometric repacking was made the default in 452b12c2e0fe (builtin/ maintenance: use "geometric" strategy by default, 2026-02-24). The fix recapitulates my work from df76ee7b77f0 (run-command: offer to close the object store before running, 2021-09-09) & friends. To guard against future regressions of this kind, add a check to `run_and_verify_geometric_pack()` in `t7900` that detects orphaned `.idx` files left behind after repacking. Contrary to interactive calls, the `git maintenance` call in that test case would _not_ block on Windows, asking whether to retry deleting that file, which is the reason why this bug was not caught earlier. Furthermore, since the default behavior of `DeleteFileW()` was changed at some point between Windows 10 Build 17134.1304 and Build 18363.657 to use POSIX semantics (see https://stackoverflow.com/a/60512798), the added orphaned-`.idx` check would be insufficient to catch this regression on modern Windows without emulating legacy delete semantics via `GIT_TEST_LEGACY_DELETE=1`. This fixes https://github.com/git-for-windows/git/issues/6210. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed May 7, 2026 at 12:51 UTC 4bb086cfa20aed183d540a701df9a71550c7caa4
2 files changed +22 -1
builtin/gc.c
+1
@@ -1590,6 +1590,7 @@ static int maintenance_task_geometric_repack(struct maintenance_run_opts *opts,
1590 pack_geometry_split(&geometry);
1591
1592 child.git_cmd = 1;
1593 + child.odb_to_close = the_repository->objects;
1594
1595 strvec_pushl(&child.args, "repack", "-d", "-l", NULL);
1596 if (geometry.split < geometry.pack_nr)
t/t7900-maintenance.sh
+21 -1
@@ -532,7 +532,16 @@ run_and_verify_geometric_pack () {
532
533 # And verify that there are no loose objects anymore.
534 git count-objects -v >count &&
535 - test_grep '^count: 0$' count
535 + test_grep '^count: 0$' count &&
536 +
537 + # Verify that no orphaned .idx files were left behind. On
538 + # Windows, a missing odb_to_close causes the parent to hold
539 + # mmap handles on .idx files, silently preventing their
540 + # deletion by the child git-repack process.
541 + ls .git/objects/pack/pack-*.idx .git/objects/pack/pack-*.pack |
542 + sed "s/\.pack$/.idx/" |
543 + sort | uniq -u >orphaned-idx &&
544 + test_must_be_empty orphaned-idx
545 }
546
547 test_expect_success 'geometric repacking task' '
@@ -580,8 +589,19 @@ test_expect_success 'geometric repacking task' '
589
590 # And these two small packs should now be merged via the
591 # geometric repack. The large packfile should remain intact.
592 + cp -R .git/objects .git/objects.save &&
593 run_and_verify_geometric_pack 2 &&
594
595 + # On Windows, verify the same with legacy delete semantics
596 + # that reject deletion of mmap-held .idx files.
597 + if test_have_prereq MINGW
598 + then
599 + rm -rf .git/objects &&
600 + mv .git/objects.save .git/objects &&
601 + test_env GIT_TEST_LEGACY_DELETE=1 \
602 + run_and_verify_geometric_pack 2
603 + fi &&
604 +
605 # If we now add two more objects and repack twice we should
606 # then see another all-into-one repack. This time around
607 # though, as we have unreachable objects, we should also see a