diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-25 23:56:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-25 23:56:20 +0300 |
commit | 36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5 (patch) | |
tree | 3fadafc81f95d070092fb0a000b10dc02f5b1669 /midx.c | |
parent | c4c9d5586fed1b994ef579a0862b86ff36afcbe8 (diff) | |
parent | d85cd1877777aa92c73868b9e86516d4be04b4a0 (diff) |
Merge branch 'ps/fix-geom-repack-with-alternates'
Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
* ps/fix-geom-repack-with-alternates:
repack: disable writing bitmaps when doing a local repack
repack: honor `-l` when calculating pack geometry
t/helper: allow chmtime to print verbosely without modifying mtime
pack-objects: extend test coverage of `--stdin-packs` with alternates
pack-objects: fix error when same packfile is included and excluded
pack-objects: fix error when packing same pack twice
pack-objects: split out `--stdin-packs` tests into separate file
repack: fix generating multi-pack-index with only non-local packs
repack: fix trying to use preferred pack in alternates
midx: fix segfault with no packs and invalid preferred pack
Diffstat (limited to 'midx.c')
-rw-r--r-- | midx.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1331,17 +1331,17 @@ static int write_midx_internal(const char *object_dir, } if (preferred_pack_name) { - int found = 0; + ctx.preferred_pack_idx = -1; + for (i = 0; i < ctx.nr; i++) { if (!cmp_idx_or_pack_name(preferred_pack_name, ctx.info[i].pack_name)) { ctx.preferred_pack_idx = i; - found = 1; break; } } - if (!found) + if (ctx.preferred_pack_idx == -1) warning(_("unknown preferred pack: '%s'"), preferred_pack_name); } else if (ctx.nr && |