summaryrefslogtreecommitdiff
path: root/index-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-11 23:00:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-11 23:00:05 (GMT)
commit82527cf33e59308b86cf3defe9ae0f5c2367a012 (patch)
treed780715fae0b171b98dbd7f71983eccf8ccecf7e /index-pack.c
parent1b2486d73789aaed0671e8d5cc60f5624d8e7ce5 (diff)
parenta91ef6e75b897a255cc17b70014a39e68dd54c7a (diff)
downloadgit-82527cf33e59308b86cf3defe9ae0f5c2367a012.zip
git-82527cf33e59308b86cf3defe9ae0f5c2367a012.tar.gz
git-82527cf33e59308b86cf3defe9ae0f5c2367a012.tar.bz2
Merge branch 'maint'
* maint: fix index-pack with packs >4GB containing deltas on 32-bit machines git-hash-object should honor config variables gitweb: correct month in date display for atom feeds
Diffstat (limited to 'index-pack.c')
-rw-r--r--index-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/index-pack.c b/index-pack.c
index 715a5bb..3c99a1f 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;