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

Nicolas Pitre · gitster · commit a91ef6e75b89 · 2007-11-11T02:57:13.000-08:00
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 &gt; file_$i
	git add file_$i
	rm file_$i
	echo "file_$i -delta" &gt;&gt; .gitattributes
done

# create "deltifiable" objects in between big objects
for i in $(seq -w 2 2 64)
do
	echo "$i $i $i" &gt;&gt; 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 &lt;nico@cam.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/index-pack.c b/index-pack.c
@@ -254,7 +254,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;

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ static void unpack_raw_entry(struct object_entry obj, union delta_base *delta_`
`254`	`254`
`255`	`255`	`static void get_data_from_pack(struct object_entry obj)`
`256`	`256`	`{`
`257`		`- unsigned long from = obj[0].idx.offset + obj[0].hdr_size;`
	`257`	`+ off_t from = obj[0].idx.offset + obj[0].hdr_size;`
`258`	`258`	`unsigned long len = obj[1].idx.offset - from;`
`259`	`259`	`unsigned long rdy = 0;`
`260`	`260`	`unsigned char src, data;`