parse-options-cb: convert to struct object_id

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 197c51912d96bd0d5cbe9f34bbc8da3f2d2623c6..4ff567db475573f8f45830983b7d3716d6832b4b 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -810,6 +810,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
                unsigned long has_size;
                read_lock();
                has_type = sha1_object_info(sha1, &has_size);
+               if (has_type < 0)
+                       die(_("cannot read existing object info %s"), sha1_to_hex(sha1));
                if (has_type != type || has_size != size)
                        die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));
                has_data = read_sha1_file(sha1, &has_type, &has_size);