Re: [PATCH 10/15] [GSOC] cat-file: add has_object_file() check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jul 01 2021, ZheNing Hu via GitGitGadget wrote:

> From: ZheNing Hu <adlternative@xxxxxxxxx>
>
> Use `has_object_file()` in `batch_one_object()` to check
> whether the input object exists. This can help us reject
> the missing oid when we let `cat-file --batch` use ref-filter
> logic later.
>
> Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
> Mentored-by: Hariom Verma <hariom18599@xxxxxxxxx>
> Signed-off-by: ZheNing Hu <adlternative@xxxxxxxxx>
> ---
>  builtin/cat-file.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index 243fe6844bc..59a86412fd0 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -428,6 +428,13 @@ static void batch_one_object(const char *obj_name,
>  		return;
>  	}
>  
> +	if (!has_object_file(&data->oid)) {
> +		printf("%s missing\n",
> +		       obj_name ? obj_name : oid_to_hex(&data->oid));
> +		fflush(stdout);
> +		return;
> +	}
> +
>  	batch_object_write(obj_name, scratch, opt, data);
>  }

In 12/15 the old "missing" is removed, so is this strictly redundant to
what's in batch_object_write() for now, does it change anything?



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux