aboutsummaryrefslogtreecommitdiff
path: root/pack-bitmap.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-09-12 11:47:23 -0700
committerJunio C Hamano <gitster@pobox.com>2024-09-12 11:47:23 -0700
commit3bf057a0cd6a75125a5bd239372f9fc4fea6c338 (patch)
tree67d0059da55bf1ed31e1b484c0ae8a9d52495de8 /pack-bitmap.h
parent04595eb4079e33496124a132832d28aba4a94dfc (diff)
parentd3e7db2b8285e3ac3e9c28df51eab8237bf9c700 (diff)
downloadgit-3bf057a0cd6a75125a5bd239372f9fc4fea6c338.tar.xz
Merge branch 'tb/multi-pack-reuse-fix'
A data corruption bug when multi-pack-index is used and the same objects are stored in multiple packfiles has been corrected. * tb/multi-pack-reuse-fix: builtin/pack-objects.c: do not open-code `MAX_PACK_OBJECT_HEADER` pack-bitmap.c: avoid repeated `pack_pos_to_offset()` during reuse builtin/pack-objects.c: translate bit positions during pack-reuse pack-bitmap: tag bitmapped packs with their corresponding MIDX t/t5332-multi-pack-reuse.sh: verify pack generation with --strict
Diffstat (limited to 'pack-bitmap.h')
-rw-r--r--pack-bitmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/pack-bitmap.h b/pack-bitmap.h
index ff0fd815b8..d7f4b8b8e9 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -60,6 +60,7 @@ struct bitmapped_pack {
uint32_t bitmap_pos;
uint32_t bitmap_nr;
+ struct multi_pack_index *from_midx; /* MIDX only */
uint32_t pack_int_id; /* MIDX only */
};