parse_object_buffer: do not set object type
The only way that "obj" can be non-NULL is if it came from one of the lookup_* functions. These functions always ensure that the object has the expected type (and return NULL otherwise), so there is no need for us to set the type. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 13, 2014 at 02:42 UTC
fe0444b50b400a2c0b6263e8bd6ba464fea0ed4f
1 file changed
-2
object.c
-2
@@ -213,8 +213,6 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
213
warning("object %s has unknown type id %d", sha1_to_hex(sha1), type);
214
obj = NULL;
215
}
216
- if (obj && obj->type == OBJ_NONE)
217
- obj->type = type;
216
return obj;
217
}
218