Re: [PATCH v4 5/6] clone: introduce struct clone_opts in builtin/clone.c

From: Patrick Steinhardt <ps@pks.im>
Date: Feb 3, 2025, 07:51 UTC
Message-ID: <Z6B1g1bkUpU78NUw@pks.im>
In-Reply-To: <20250131-toon-clone-refs-v4-5-2a4ff851498f@iotcl.com>

On Fri, Jan 31, 2025 at 04:30:33PM +0100, Toon Claes wrote:

Show 39 quoted lines

> diff --git a/builtin/clone.c b/builtin/clone.c
> index 7ab156ac00240de89baca6533ed2541839286fc4..f92017c751dd31cb25a3ba31667b015d5766ce84 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -429,23 +436,27 @@ static struct ref *find_remote_branch(const struct ref *refs, const char *branch
>  	return ref;
>  }
>  
> -static struct ref *wanted_peer_refs(const struct ref *refs,
> -		struct refspec *refspec)
> +static struct ref *wanted_peer_refs(struct clone_opts *opts,
> +				    const struct ref *refs,
> +				    struct refspec *refspec)
>  {
> -	struct ref *head = copy_ref(find_ref_by_name(refs, "HEAD"));
> -	struct ref *local_refs = head;
> -	struct ref **tail = local_refs ? &local_refs->next : &local_refs;
> +	struct ref *local_refs = NULL;
> +	struct ref **tail = &local_refs;
>  	struct ref *to_free = NULL;
>  
> -	if (option_single_branch) {
> -		if (!option_branch)
> +	if (opts->wants_head) {
> +		struct ref *head = copy_ref(find_ref_by_name(refs, "HEAD"));
> +		if (head)
> +			tail_link_ref(head, &tail);
> +
> +		if (option_single_branch)
>  			refs = to_free = guess_remote_head(head, refs, 0);
> -		else {
> -			free_one_ref(head);
> -			local_refs = head = NULL;
> -			tail = &local_refs;
> -			refs = to_free = copy_ref(find_remote_branch(refs, option_branch));
> -		}
> +	}
> +
> +	else if (option_single_branch) {

Formatting: the `else if` should be on the same line as the closing
brace.

Show 12 quoted lines

> +		local_refs = NULL;
> +		tail = &local_refs;
> +		refs = to_free = copy_ref(find_remote_branch(refs, option_branch));
>  	}
>  
>  	for (int i = 0; i < refspec->nr; i++)
> @@ -893,6 +904,8 @@ int cmd_clone(int argc,
>  	struct string_list server_options = STRING_LIST_INIT_NODUP;
>  	const char *bundle_uri = NULL;
>  
> +	struct clone_opts opts = CLONE_OPTS_INIT;
> +

Nit: There's a bit too many empty lines to my taste, without a clear
reason why.

Show 13 quoted lines

>  	struct transport_ls_refs_options transport_ls_refs_options =
>  		TRANSPORT_LS_REFS_OPTIONS_INIT;
>  
> @@ -1343,9 +1356,13 @@ int cmd_clone(int argc,
>  	if (option_not.nr)
>  		transport_set_option(transport, TRANS_OPT_DEEPEN_NOT,
>  				     (const char *)&option_not);
> -	if (option_single_branch)
> +	if (option_single_branch) {
>  		transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
>  
> +		if (option_branch)
> +			opts.wants_head = 0;

Makes sense. If we only want to clone a single branch, and we specify which branch that is, then there is no need to fetch the remote HEAD.

Show 22 quoted lines

> +	}
> +
>  	if (option_upload_pack)
>  		transport_set_option(transport, TRANS_OPT_UPLOADPACK,
>  				     option_upload_pack);
> @@ -1450,7 +1467,7 @@ int cmd_clone(int argc,
>  	}
>  
>  	if (refs)
> -		mapped_refs = wanted_peer_refs(refs, &remote->fetch);
> +		mapped_refs = wanted_peer_refs(&opts, refs, &remote->fetch);
>  
>  	if (mapped_refs) {
>  		/*
> index bda10dd5c85ffd8988a6c3d39583e7b9701278b8..65d2de2c2051cf28def8b43fcca3fd5e1c86a0d8 100644
> --- a/remote.h
> +++ b/remote.h
> @@ -219,6 +219,7 @@ struct ref *alloc_ref(const char *name);
>  struct ref *copy_ref(const struct ref *ref);
>  struct ref *copy_ref_list(const struct ref *ref);
>  int count_refspec_match(const char *, struct ref *refs, struct ref **matched_ref);
> +void tail_link_ref(struct ref *ref, struct ref ***tail);

Can we maybe add a comment explaining what this function does?

Patrick