From: Thomas Rast Date: Thu, 30 May 2013 20:00:22 +0000 (+0200) Subject: sha1_file: silence sha1_loose_object_info X-Git-Tag: v1.8.4-rc0~182^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dbea72a8c05d12c7dfd6a35376e62b21d5a655b5 sha1_file: silence sha1_loose_object_info sha1_object_info() returns -1 (OBJ_BAD) if it cannot find the object for some reason, which suggests that it wants the _caller_ to report this error. However, part of its work happens in sha1_loose_object_info, which _does_ report errors itself. This is doubly strange because: * packed_object_info(), which is the other half of the duo, does _not_ report this. * In the event that an object is packed and pruned while sha1_object_info_extended() goes looking for it, we would erroneously show the error -- even though the code of the latter function purports to handle this case gracefully. * A caller might invoke sha1_object_info() to find the type of an object even if that object is not known to exist. Silence this error. The others remain untouched as a corrupt object is a much more grave error than it merely being absent. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- diff --git a/sha1_file.c b/sha1_file.c index 40b23297b2..d804e25454 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2140,7 +2140,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, unsigned long *size map = map_sha1_file(sha1, &mapsize); if (!map) - return error("unable to find %s", sha1_to_hex(sha1)); + return -1; if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) status = error("unable to unpack %s header", sha1_to_hex(sha1));