Merge branch 'nd/traces'

diff --git a/sha1_file.c b/sha1_file.c
index 7fa62c2d9345c0e42c08684866de95176e6acea0..16f08d475cde5e96282aa830dd3373277c2b898f 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2148,7 +2148,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                if (!data)
                        die("failed to apply delta");
 
-               free (delta_data);
+               free(delta_data);
        }
 
        *final_type = type;
@@ -2358,7 +2358,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));