Re: [PATCH v3 3/5] clone: add --bundle-uri option
Derrick Stolee <derrickstolee@github.com> writes:
Show 11 quoted lines
> From: Derrick Stolee <derrickstolee@github.com>
> Date: Tue, 23 Aug 2022 09:53:47 -0400
> Subject: [PATCH] clone: warn on failure to repo_init()
>
> The --bundle-uri option was added in 55568919616 (clone: add
> --bundle-uri option, 2022-08-09), but this also introduced a call to
> repo_init() whose return value was ignored. Fix that ignored value by
> warning that the bundle URI process could not continue if it failed.
>
> Signed-off-by: Derrick Stolee <derrickstolee@github.com>
> ---
OK. It looks like a sensible thing to do.
Show 19 quoted lines
> builtin/clone.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 4463789680b..e21d42dfee5 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -1245,8 +1245,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> */
> if (bundle_uri) {
> /* At this point, we need the_repository to match the cloned repo. */
> - repo_init(the_repository, git_dir, work_tree);
> - if (fetch_bundle_uri(the_repository, bundle_uri))
> + if (repo_init(the_repository, git_dir, work_tree))
> + warning(_("failed to initialize the repo, skipping bundle URI"));
> + else if (fetch_bundle_uri(the_repository, bundle_uri))
> warning(_("failed to fetch objects from bundle URI '%s'"),
> bundle_uri);
> }Junio C Hamano <gitster@pobox.com>