summaryrefslogtreecommitdiff
path: root/index-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-25 20:56:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-25 20:56:36 (GMT)
commitd9d9e6ee6366fed93a4beff3994bad376f81eabd (patch)
treebd666fa15e440aaa1d12e2092489cd20770111f8 /index-pack.c
parentc921cc92e5ff2ead4dea112b19e555f521cf20b8 (diff)
parentbfce5087ee01fdead5cdc52180c8eef22adbbd71 (diff)
downloadgit-d9d9e6ee6366fed93a4beff3994bad376f81eabd.zip
git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.gz
git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.bz2
Merge branch 'maint'
* maint: Makefile: fix shell quoting tests: propagate $(TAR) down from the toplevel Makefile index-pack.c: correctly initialize appended objects send-email: find body-encoding correctly
Diffstat (limited to 'index-pack.c')
-rw-r--r--index-pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/index-pack.c b/index-pack.c
index ac20a46..52064be 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -699,6 +699,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);