Code

sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
authorNicolas Pitre <nico@cam.org>
Mon, 26 Feb 2007 19:55:57 +0000 (14:55 -0500)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Feb 2007 09:34:21 +0000 (01:34 -0800)
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
sha1_file.c

index 8147a4f5054694a1d715128b7e9bd761ade930ca..8b7b68c45b4b72e21d4902bcd92ecd6b3d476ee6 100644 (file)
@@ -1461,7 +1461,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, char *type, unsigne
        if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
                status = error("unable to unpack %s header",
                               sha1_to_hex(sha1));
-       if (parse_sha1_header(hdr, type, &size) < 0)
+       else if (parse_sha1_header(hdr, type, &size) < 0)
                status = error("unable to parse %s header", sha1_to_hex(sha1));
        else {
                status = 0;