aboutsummaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-02-26 14:55:57 -0500
committerJunio C Hamano <junkio@cox.net>2007-02-27 01:34:21 -0800
commit9ba630318f6fbc2f129e5a6872d70d2914cacb39 (patch)
treed7f2e9484b778fee07e04bd7a8ef7747f44cccad /sha1_file.c
parent2b87c45ba6f8950ffc44cb6a3c861ad2e5f176a8 (diff)
downloadgit-9ba630318f6fbc2f129e5a6872d70d2914cacb39.tar.gz
git-9ba630318f6fbc2f129e5a6872d70d2914cacb39.tar.xz
sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 8147a4f50..8b7b68c45 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -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;