Re: [PATCH v2 07/11] refs: expose function to parse reference URIs
- From
Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
- Date
- Sep 8, 2026, 13:47 UTC
- Message-ID
- <54fc5f97-a8ed-4927-8b48-1b4c3c7b413a@gmail.com>
- In-Reply-To
- <20260907-b4-pks-unify-ref-storage-format-v2-7-6733c90ca5b0@pks.im>
On 9/7/26 16:48, Patrick Steinhardt wrote:
Show 6 quoted lines
> In the next commit we're about to add more sites that want to parse a > reference backends URI into a format and payload. Expose a new function > `ref_storage_format_by_uri()` that enables this. > > Signed-off-by: Patrick Steinhardt <ps@pks.im> > ---
Show 27 quoted lines
> enum ref_transaction_error {
> /* Default error code */
> REF_TRANSACTION_ERROR_GENERIC = -1,
> diff --git a/setup.c b/setup.c
> index dfe05d9a03..3be7dac452 100644
> --- a/setup.c
> +++ b/setup.c
>
> @@ -2069,16 +2051,12 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok)
> */
> ref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);
> if (ref_backend_uri) {
> - char *format;
> -
> - free(discovery.format.ref_storage_payload);
> -
> - parse_reference_uri(ref_backend_uri, &format, &discovery.format.ref_storage_payload);
> - discovery.format.ref_storage_format = ref_storage_format_by_name(format);
> + FREE_AND_NULL(discovery.format.ref_storage_payload);
> + discovery.format.ref_storage_format =
> + ref_storage_format_by_uri(ref_backend_uri,
> + &discovery.format.ref_storage_payload);
> if (discovery.format.ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)
> - die(_("unknown ref storage format: '%s'"), format);
> -
> - free(format);
> + die(_("unknown ref storage format: '%s'"), ref_backend_uri);If I'm not mistaken, we have now started printing the whole ref storage backend configuration rather than just the name. I could see that we don't actually have any variable that returns just the name part after the refactor. I could also understand that we can't always expect a '://' in the GIT_REF_STORAGE_FORMAT configuration so printing the whole configuration may make sense. But could we possibly improve the error message a bit? May be phrase it as follows:
$ GIT_REF_STORAGE_FORMAT=garbage://hello-world ./git status fatal: invalid ref storage format configuration: 'garbage://hello-world'
Show 15 quoted lines
> @@ -2806,18 +2784,16 @@ static void repository_format_configure(struct repository_format *repo_fmt,
>
> ref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);
> if (ref_backend_uri) {
> - char *backend, *payload;
> enum ref_storage_format format;
> + char *payload;
>
> - parse_reference_uri(ref_backend_uri, &backend, &payload);
> - format = ref_storage_format_by_name(backend);
> + format = ref_storage_format_by_uri(ref_backend_uri, &payload);
> if (format == REF_STORAGE_FORMAT_UNKNOWN)
> - die(_("unknown ref storage format: '%s'"), backend);
> + die(_("unknown ref storage format: '%s'"), ref_backend_uri);
> Ditto here.
-- Sivaraam