mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jk/index-pack-report-missing' into maint
The error reporting from "git index-pack" has been improved to distinguish missing objects from type errors. * jk/index-pack-report-missing: index-pack: distinguish missing objects from type errors
This commit is contained in:
commit
182c3d69e4
|
@ -207,8 +207,13 @@ static unsigned check_object(struct object *obj)
|
|||
if (!(obj->flags & FLAG_CHECKED)) {
|
||||
unsigned long size;
|
||||
int type = sha1_object_info(obj->sha1, &size);
|
||||
if (type != obj->type || type <= 0)
|
||||
die(_("object of unexpected type"));
|
||||
if (type <= 0)
|
||||
die(_("did not receive expected object %s"),
|
||||
sha1_to_hex(obj->sha1));
|
||||
if (type != obj->type)
|
||||
die(_("object %s: expected type %s, found %s"),
|
||||
sha1_to_hex(obj->sha1),
|
||||
typename(obj->type), typename(type));
|
||||
obj->flags |= FLAG_CHECKED;
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue