undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/index-pack-report-missing'

Browse Source 
* jk/index-pack-report-missing:
  index-pack: distinguish missing objects from type errors
This commit is contained in:
Junio C Hamano 2014-06-06 11:28:13 -07:00
commit a0460132a7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/index-pack.c
View File

@ -207,8 +207,13 @@ static unsigned check_object(struct object *obj)
if (!(obj->flags & FLAG_CHECKED)) { if (!(obj->flags & FLAG_CHECKED)) {
unsigned long size; unsigned long size;
int type = sha1_object_info(obj->sha1, &size); int type = sha1_object_info(obj->sha1, &size);
if (type != obj->type || type <= 0) if (type <= 0)
die(_("object of unexpected type")); 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; obj->flags |= FLAG_CHECKED;
return 1; return 1;
} }