aboutsummaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-10-29 19:02:46 -0400
committerJunio C Hamano <gitster@pobox.com>2008-11-02 15:22:34 -0800
commit09ded04b7e1f0096bb2fe356b2f5a298296151dd (patch)
tree13edd1bc4fa767aa81bdfd71bb6de235e48ed3f5 /builtin-pack-objects.c
parentd8f325563d85abcd9816311b3a84093b2d1cda9f (diff)
downloadgit-09ded04b7e1f0096bb2fe356b2f5a298296151dd.tar.gz
git-09ded04b7e1f0096bb2fe356b2f5a298296151dd.tar.xz
make unpack_object_header() non fatal
It is possible to have pack corruption in the object header. Currently unpack_object_header() simply die() on them instead of letting the caller deal with that gracefully. So let's have unpack_object_header() return an error instead, and find a better name for unpack_object_header_gently() in that context. All callers of unpack_object_header() are ready for it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index cc1e47f41..64aefdf23 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1002,7 +1002,7 @@ static void check_object(struct object_entry *entry)
* We want in_pack_type even if we do not reuse delta
* since non-delta representations could still be reused.
*/
- used = unpack_object_header_gently(buf, avail,
+ used = unpack_object_header_buffer(buf, avail,
&entry->in_pack_type,
&entry->size);