Re: [PATCH v2 6/6] sha1_loose_object_info: do not complain out loud on non-existent objects

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: May 23, 2012, 14:24 UTC
Message-ID: <CACsJy8A5Xv8_KY2z4eQvm2e=3e=KjDJyVM+-d0dmXntHJ-6efg@mail.gmail.com>
In-Reply-To: <1337782191-10091-6-git-send-email-pclouds@gmail.com>

On Wed, May 23, 2012 at 9:09 PM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:

>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  makes sense to me, but I might have overlooked something

while it's still making sense for me, i think it's more logical to move the check to the caller, where "entry in pack?" check is also done.

Show 20 quoted lines

>
>  sha1_file.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/sha1_file.c b/sha1_file.c
> index 3c4f165..520b41e 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -2133,6 +2133,8 @@ static int sha1_loose_object_info(const unsigned char *sha1, unsigned long *size
>        git_zstream stream;
>        char hdr[32];
>
> +       if (!has_loose_object(sha1))
> +               return -1;
>        map = map_sha1_file(sha1, &mapsize);
>        if (!map)
>                return error("unable to find %s", sha1_to_hex(sha1));
> --
> 1.7.10.2.549.g9354186
>

-- 
Duy