Re: [PATCH v2 7/8] submodule-config: pass repo upon blob config read

From: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Date: Aug 16, 2021, 15:48 UTC
Message-ID: <CAHd-oW4rd6=9WP-7k-Z9V1Z-4nDXR13-45cjyB6GEczxD3+56g@mail.gmail.com>
In-Reply-To: <94db10a4e5943d689113693c64633ddffa5508cc.1628888668.git.jonathantanmy@google.com>

On Fri, Aug 13, 2021 at 6:05 PM Jonathan Tan <jonathantanmy@google.com> wrote:

Oops, I accidentally deleted this part in my previous reply:

Show 15 quoted lines

> diff --git a/config.c b/config.c
> index f33abeab85..a85c12e6cc 100644
> --- a/config.c
> +++ b/config.c
> @@ -1820,6 +1821,7 @@ int git_config_from_blob_oid(config_fn_t fn,
>  }
>
>  static int git_config_from_blob_ref(config_fn_t fn,
> +                                   struct repository *repo,
>                                     const char *name,
>                                     void *data)
>  {
> @@ -1827,7 +1829,7 @@ static int git_config_from_blob_ref(config_fn_t fn,
>
>         if (get_oid(name, &oid) < 0)

This should be `repo_get_oid(repo, ...)` now.

>                 return error(_("unable to resolve config blob '%s'"), name);
> -       return git_config_from_blob_oid(fn, name, &oid, data);
> +       return git_config_from_blob_oid(fn, name, repo, &oid, data);
>  }