diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-06 15:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-06 15:42:49 -0700 |
| commit | 03311dca7f91f69e9e0c532fce1c1e3c0a9fa34d (patch) | |
| tree | 99942cb6e498bd5ff78b17ea65618125372e3876 /packfile.c | |
| parent | d75badf83bc3fc8e47413970874bac681eeb5bbe (diff) | |
| parent | 9ad29df36d7c762677b5a4ecc6a6dc229c818b2a (diff) | |
| download | git-03311dca7f91f69e9e0c532fce1c1e3c0a9fa34d.tar.xz | |
Merge branch 'tb/stdin-packs-excluded-but-open'
pack-objects's --stdin-packs=follow mode learns to handle
excluded-but-open packs.
* tb/stdin-packs-excluded-but-open:
repack: mark non-MIDX packs above the split as excluded-open
pack-objects: support excluded-open packs with --stdin-packs
t7704: demonstrate failure with once-cruft objects above the geometric split
pack-objects: refactor `read_packs_list_from_stdin()` to use `strmap`
pack-objects: plug leak in `read_stdin_packs()`
Diffstat (limited to 'packfile.c')
| -rw-r--r-- | packfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c index ee9c7ea1d1..48c88748b6 100644 --- a/packfile.c +++ b/packfile.c @@ -2244,7 +2244,8 @@ struct packed_git **packfile_store_get_kept_pack_cache(struct packfile_store *st struct packed_git *p = e->pack; if ((p->pack_keep && (flags & KEPT_PACK_ON_DISK)) || - (p->pack_keep_in_core && (flags & KEPT_PACK_IN_CORE))) { + (p->pack_keep_in_core && (flags & KEPT_PACK_IN_CORE)) || + (p->pack_keep_in_core_open && (flags & KEPT_PACK_IN_CORE_OPEN))) { ALLOC_GROW(packs, nr + 1, alloc); packs[nr++] = p; } |