On Wed, Oct 06, 2021 at 05:24:14PM -0700, Junio C Hamano wrote:
> * tb/repack-write-midx (2021-10-01) 9 commits
> (merged to 'next' on 2021-10-06 at ccdd5aaf2a)
> + builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
> + builtin/repack.c: make largest pack preferred
> + builtin/repack.c: support writing a MIDX while repacking
> + builtin/repack.c: extract showing progress to a variable
> + builtin/repack.c: rename variables that deal with non-kept packs
> + builtin/repack.c: keep track of existing packs unconditionally
> + midx: preliminary support for `--refs-snapshot`
> + builtin/multi-pack-index.c: support `--stdin-packs` mode
> + midx: expose `write_midx_file_only()` publicly
>
> "git repack" has been taught to generate multi-pack reachability
> bitmaps.
>
> Will merge to 'master'.
Sorry not to catch this before it hit 'next', but there's a small leak
in the test helper. This patch can go on top to fix it.
-- >8 --
Subject: [PATCH] test-read-midx: fix leak of bitmap_index struct
In read_midx_preferred_pack(), we open the bitmap index but never free
it. This isn't a big deal since this is just a test helper, and we exit
immediately after, but since we're trying to keep our leak-checking tidy
now, it's worth fixing.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
t/helper/test-read-midx.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 0038559129..9d6fa7a377 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -85,11 +85,15 @@ static int read_midx_preferred_pack(const char *object_dir)
return 1;
bitmap = prepare_bitmap_git(the_repository);
- if (!(bitmap && bitmap_is_midx(bitmap)))
+ if (!bitmap)
return 1;
-
+ if (!bitmap_is_midx(bitmap)) {
+ free_bitmap_index(bitmap);
+ return 1;
+ }
printf("%s\n", midx->pack_names[midx_preferred_pack(bitmap)]);
+ free_bitmap_index(bitmap);
return 0;
}
--
2.33.0.1340.gfe2cb2531f
