From: Björn Steinbrink Date: Thu, 24 Jul 2008 17:32:00 +0000 (+0100) Subject: index-pack.c: correctly initialize appended objects X-Git-Tag: v1.6.0-rc1~39^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72de2883bd7d4ceda05f107826c7607c594de965;p=git.git index-pack.c: correctly initialize appended objects When index-pack completes a thin pack it appends objects to the pack. Since the commit 92392b4(index-pack: Honor core.deltaBaseCacheLimit when resolving deltas) such an object can be pruned in case of memory pressure, and will be read back again by get_data_from_pack(). For this to work, the fields in object_entry structure need to be initialized properly. Noticed by Pierre Habouzit. Signed-off-by: Björn Steinbrink Acked-by: Nicolas Pitre Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- diff --git a/index-pack.c b/index-pack.c index c359f8c9d..7d5344abc 100644 --- a/index-pack.c +++ b/index-pack.c @@ -698,6 +698,10 @@ static struct object_entry *append_obj_to_pack( write_or_die(output_fd, header, n); obj[0].idx.crc32 = crc32(0, Z_NULL, 0); obj[0].idx.crc32 = crc32(obj[0].idx.crc32, header, n); + obj[0].size = size; + obj[0].hdr_size = n; + obj[0].type = type; + obj[0].real_type = type; obj[1].idx.offset = obj[0].idx.offset + n; obj[1].idx.offset += write_compressed(output_fd, buf, size, &obj[0].idx.crc32); hashcpy(obj->idx.sha1, sha1);