[PATCH 1/2] sha1_file: silence sha1_loose_object_info
- From
Thomas Rast <trast@inf.ethz.ch>
- Date
- May 30, 2013, 20:00 UTC
- Message-ID
- <2d926e4dbd218b2305f50652c00a5c1d87e81208.1369943791.git.trast@inf.ethz.ch>
- In-Reply-To
- <87bo7sbeoc.fsf@linux-k42r.v.cablecom.net>
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 <trast@inf.ethz.ch> --- sha1_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c index 67e815b..c0f6a0e 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2348,7 +2348,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));
-- 1.8.3.506.g4fdeee5