[PATCH 1/2] parse_object(): drop extra "has" check before checking object type
- From
Jeff King <peff@peff.net>
- Date
- Nov 17, 2022, 22:37 UTC
- Message-ID
- <Y3a3xnYNyiDQknTM@coredump.intra.peff.net>
- In-Reply-To
- <Y3a3qcqNG8W3ueeb@coredump.intra.peff.net>
When parsing an object of unknown type, we check to see if it's a blob, so we can use our streaming code path. This uses oid_object_info() to check the type, but before doing so we call repo_has_object_file(). This latter is pointless, as oid_object_info() will already fail if the object is missing. Checking it ahead of time just complicates the code and is a waste of resources (albeit small).
Let's drop the redundant check.
Signed-off-by: Jeff King <peff@peff.net> --- object.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/object.c b/object.c index 8a74eb85e9..16eb944e98 100644 --- a/object.c +++ b/object.c @@ -287,8 +287,7 @@ struct object *parse_object_with_flags(struct repository *r, } if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) || - (!obj && repo_has_object_file(r, oid) && - oid_object_info(r, oid, NULL) == OBJ_BLOB)) { + (!obj && oid_object_info(r, oid, NULL) == OBJ_BLOB)) { if (!skip_hash && stream_object_signature(r, repl) < 0) { error(_("hash mismatch %s"), oid_to_hex(oid)); return NULL;
-- 2.38.1.890.g50b10763b9