Skip to content

Commit bab2ac3

Browse files
committed
pack-objects: prevent name hash version change
When the --name-hash-version option is used in 'git pack-objects', it can change from the initial assignment to when it is used based on interactions with other arguments. Specifically, when writing or reading bitmaps, we must force version 1 for now. This could change in the future when the bitmap format can store a name hash version value, indicating which was used during the writing of the packfile. Protect the 'git pack-objects' process from getting confused by failing with a BUG() statement if the value of the name hash version changes between calls to pack_name_hash_fn(). Signed-off-by: Derrick Stolee <[email protected]>
1 parent 06a9506 commit bab2ac3

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

builtin/pack-objects.c

+8
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,14 @@ static void validate_name_hash_version(void)
284284

285285
static inline uint32_t pack_name_hash_fn(const char *name)
286286
{
287+
static int seen_version = -1;
288+
289+
if (seen_version < 0)
290+
seen_version = name_hash_version;
291+
else if (seen_version != name_hash_version)
292+
BUG("name hash version changed from %d to %d mid-process",
293+
seen_version, name_hash_version);
294+
287295
switch (name_hash_version) {
288296
case 1:
289297
return pack_name_hash(name);

0 commit comments

Comments
 (0)