summaryrefslogtreecommitdiff
path: root/index-pack.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-10 15:39:20 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-10 15:39:20 (GMT)
commite782e12f89955dfb0be82098af3cfdd8dd0eaf80 (patch)
treebeaefcdcab01a967d65e5f7373d2a7997fda8335 /index-pack.c
parent23abd3f48cb217d1558fa1984bfa8c502717c08f (diff)
parentff74126c03a8dfd04e7533573a5c420f2a7112ac (diff)
downloadgit-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.zip
git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.gz
git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.bz2
Merge branch 'maint'
* maint: rebase -i: do not fail when there is no commit to cherry-pick test-lib: fix color reset in say_color() fix pread()'s short read in index-pack Conflicts: csum-file.c
Diffstat (limited to 'index-pack.c')
-rw-r--r--index-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/index-pack.c b/index-pack.c
index 73860bf..d3a4d31 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -707,6 +707,7 @@ static struct object_entry *append_obj_to_pack(struct sha1file *f,
obj[1].idx.offset = obj[0].idx.offset + n;
obj[1].idx.offset += write_compressed(f, buf, size);
obj[0].idx.crc32 = crc32_end(f);
+ sha1flush(f);
hashcpy(obj->idx.sha1, sha1);
return obj;
}