Merge branch 'jk/commit-buffer-length'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 54b089542b91fe786f4f75fe363cd1d5fb1635ff..8b3bd29dbcf22668040c53fffb6e2414ca090f5d 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -554,7 +554,7 @@ static void *unpack_data(struct object_entry *obj,
 
        do {
                ssize_t n = (len < 64*1024) ? len : 64*1024;
-               n = pread(get_thread_data()->pack_fd, inbuf, n, from);
+               n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
                if (n < 0)
                        die_errno(_("cannot pread pack file"));
                if (!n)
@@ -786,7 +786,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
                        }
                        if (obj->type == OBJ_COMMIT) {
                                struct commit *commit = (struct commit *) obj;
-                               commit->buffer = NULL;
+                               if (detach_commit_buffer(commit, NULL) != data)
+                                       die("BUG: parse_object_buffer transmogrified our buffer");
                        }
                        obj->flags |= FLAG_CHECKED;
                }