From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:23 +0000 (-0700)
Subject: Merge branch 'bw/clone-ref-prefixes'
X-Git-Tag: v2.19.0-rc0~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d7a20258f791485d0fa0094e930eee094a77076?hp=-c

Merge branch 'bw/clone-ref-prefixes'

The wire-protocol v2 relies on the client to send "ref prefixes" to
limit the bandwidth spent on the initial ref advertisement.  "git
clone" when learned to speak v2 forgot to do so, which has been
corrected.

* bw/clone-ref-prefixes:
clone: send ref-prefixes when using protocol v2
---

2d7a20258f791485d0fa0094e930eee094a77076
diff --combined builtin/clone.c
index 9ebb5acf56,5c0adbd6d0..26fb0da42d
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@@ -15,7 -15,6 +15,7 @@@
  #include "fetch-pack.h"
  #include "refs.h"
  #include "refspec.h"
 +#include "object-store.h"
  #include "tree.h"
  #include "tree-walk.h"
  #include "unpack-trees.h"
@@@ -696,8 -695,7 +696,8 @@@ static void update_head(const struct re
  			install_branch_config(0, head, option_origin, our->name);
  		}
  	} else if (our) {
 -		struct commit *c = lookup_commit_reference(&our->old_oid);
 +		struct commit *c = lookup_commit_reference(the_repository,
 +							   &our->old_oid);
  		/* --branch specifies a non-branch (i.e. tags), detach HEAD */
  		update_ref(msg, "HEAD", &c->object.oid, NULL, REF_NO_DEREF,
  			   UPDATE_REFS_DIE_ON_ERR);
@@@ -897,7 -895,8 +897,8 @@@ int cmd_clone(int argc, const char **ar
  	int err = 0, complete_refs_before_fetch = 1;
  	int submodule_progress;
  
- 	struct refspec_item refspec;
+ 	struct refspec rs = REFSPEC_INIT_FETCH;
+ 	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
  
  	fetch_if_missing = 0;
  
@@@ -1079,7 -1078,7 +1080,7 @@@
  	if (option_required_reference.nr || option_optional_reference.nr)
  		setup_reference();
  
- 	refspec_item_init_or_die(&refspec, value.buf, REFSPEC_FETCH);
+ 	refspec_append(&rs, value.buf);
  
  	strbuf_reset(&value);
  
@@@ -1136,10 -1135,18 +1137,18 @@@
  	if (transport->smart_options && !deepen && !filter_options.choice)
  		transport->smart_options->check_self_contained_and_connected = 1;
  
- 	refs = transport_get_remote_refs(transport, NULL);
+ 
+ 	argv_array_push(&ref_prefixes, "HEAD");
+ 	refspec_ref_prefixes(&rs, &ref_prefixes);
+ 	if (option_branch)
+ 		expand_ref_prefix(&ref_prefixes, option_branch);
+ 	if (!option_no_tags)
+ 		argv_array_push(&ref_prefixes, "refs/tags/");
+ 
+ 	refs = transport_get_remote_refs(transport, &ref_prefixes);
  
  	if (refs) {
- 		mapped_refs = wanted_peer_refs(refs, &refspec);
+ 		mapped_refs = wanted_peer_refs(refs, &rs.items[0]);
  		/*
  		 * transport_get_remote_refs() may return refs with null sha-1
  		 * in mapped_refs (see struct transport->get_refs_list
@@@ -1157,7 -1164,7 +1166,7 @@@
  			}
  
  		if (!is_local && !complete_refs_before_fetch)
 -			transport_fetch_refs(transport, mapped_refs);
 +			transport_fetch_refs(transport, mapped_refs, NULL);
  
  		remote_head = find_ref_by_name(refs, "HEAD");
  		remote_head_points_at =
@@@ -1199,11 -1206,11 +1208,11 @@@
  	if (is_local)
  		clone_local(path, git_dir);
  	else if (refs && complete_refs_before_fetch)
 -		transport_fetch_refs(transport, mapped_refs);
 +		transport_fetch_refs(transport, mapped_refs, NULL);
  
  	update_remote_refs(refs, mapped_refs, remote_head_points_at,
  			   branch_top.buf, reflog_msg.buf, transport,
 -			   !is_local && !filter_options.choice);
 +			   !is_local);
  
  	update_head(our_head_points_at, remote_head, reflog_msg.buf);
  
@@@ -1233,6 -1240,7 +1242,7 @@@
  	strbuf_release(&value);
  	junk_mode = JUNK_LEAVE_ALL;
  
- 	refspec_item_clear(&refspec);
+ 	refspec_clear(&rs);
+ 	argv_array_clear(&ref_prefixes);
  	return err;
  }