parse_object(): simplify blob conditional

Commit 8db2dad7a0 (parse_object(): check on-disk type of suspected blob,
2022-11-17) simplified the conditional for checking if we might have a
blob. But we can simplify it further. In:

  !obj || (obj && obj->type == OBJ_BLOB)

the short-circuit "OR" means "obj" will always be true on the right-hand
side. The compiler almost certainly optimized that out anyway, but
dropping it makes the conditional easier to understand for humans.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object.c b/object.c
index fad1a5af4a63eb274ac5583dd50e455a33d5dbee..682b852a46c1aa89c85c24c66660a1948b5c2184 100644 (file)
--- a/object.c
+++ b/object.c
@@ -286,7 +286,7 @@ struct object *parse_object_with_flags(struct repository *r,
                        return &commit->object;
        }
 
-       if ((!obj || (obj && obj->type == OBJ_BLOB)) &&
+       if ((!obj || obj->type == OBJ_BLOB) &&
            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));