Re: [PATCH 10/15] [GSOC] cat-file: add has_object_file() check
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jul 2, 2021, 13:34 UTC
- Message-ID
- <87a6n4alfk.fsf@evledraar.gmail.com>
- In-Reply-To
- <18f38075b3c70748894ad6b2e1158f2b17460845.1625155693.git.gitgitgadget@gmail.com>
On Thu, Jul 01 2021, ZheNing Hu via GitGitGadget wrote:
Show 31 quoted lines
> From: ZheNing Hu <adlternative@gmail.com>
>
> 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@gmail.com>
> Mentored-by: Hariom Verma <hariom18599@gmail.com>
> Signed-off-by: ZheNing Hu <adlternative@gmail.com>
> ---
> 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?