threads / patch / 10794

patchfix index-pack with packs >4GB containing deltas on 32-bit machines

Subject: [PATCH] fix index-pack with packs >4GB containing deltas on 32-bit machines

## tl;dr

2 messages between Nov 11, 2007 and Nov 11, 2007. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Nicolas Pitre· Nov 11, 2007, 04:29 UTC · lore

This probably hasn't been properly tested before. Here's a script to create a 8GB repo with the necessary characteristics (copy the test-genrandom executable from the Git build tree to /tmp first):

----- #!/bin/bash

git init git config core.compression 0

# create big objects with no deltas
for i in $(seq -w 1 2 63)
do
	echo $i
	/tmp/test-genrandom $i 268435456 > file_$i
	git add file_$i
	rm file_$i
	echo "file_$i -delta" >> .gitattributes
done
# create "deltifiable" objects in between big objects
for i in $(seq -w 2 2 64)
do
	echo "$i $i $i" >> grow
	cp grow file_$i
	git add file_$i
	rm file_$i
done
rm grow

# create a pack with them git commit -q -m "commit of big objects interlaced with small deltas" git repack -a -d -----

Then clone this repo over the Git protocol.
Signed-off-by: Nicolas Pitre <nico@cam.org>
---
Show changes to index-pack.c +1 −1
diff --git a/index-pack.c b/index-pack.c
index 469a330..9fd6982 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -256,7 +256,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_
 
 static void *get_data_from_pack(struct object_entry *obj)
 {
-	unsigned long from = obj[0].idx.offset + obj[0].hdr_size;
+	off_t from = obj[0].idx.offset + obj[0].hdr_size;
 	unsigned long len = obj[1].idx.offset - from;
 	unsigned long rdy = 0;
 	unsigned char *src, *data;

← back to recent threads