From: Junio C Hamano <redacted>
Date: Tue, 7 Jul 2020 05:09:13 +0000 (-0700)
Subject: Merge branch 'bc/sha-256-part-2'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=12210859da0c16c644dab658d9e1ef671ec28788;p=git.git

Merge branch 'bc/sha-256-part-2'

SHA-256 migration work continues.

* bc/sha-256-part-2: (44 commits)
  remote-testgit: adapt for object-format
  bundle: detect hash algorithm when reading refs
  t5300: pass --object-format to git index-pack
  t5704: send object-format capability with SHA-256
  t5703: use object-format serve option
  t5702: offer an object-format capability in the test
  t/helper: initialize the repository for test-sha1-array
  remote-curl: avoid truncating refs with ls-remote
  t1050: pass algorithm to index-pack when outside repo
  builtin/index-pack: add option to specify hash algorithm
  remote-curl: detect algorithm for dumb HTTP by size
  builtin/ls-remote: initialize repository based on fetch
  t5500: make hash independent
  serve: advertise object-format capability for protocol v2
  connect: parse v2 refs with correct hash algorithm
  connect: pass full packet reader when parsing v2 refs
  Documentation/technical: document object-format for protocol v2
  t1302: expect repo format version 1 for SHA-256
  builtin/show-index: provide options to determine hash algo
  t5302: modernize test formatting
  ...
---

12210859da0c16c644dab658d9e1ef671ec28788
diff --cc connect.c
index 0df45a1108,2ada5b5161..e0d5b9fee0
--- a/connect.c
+++ b/connect.c
@@@ -419,10 -442,10 +454,11 @@@ void check_stateless_delimiter(int stat
  struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
  			     struct ref **list, int for_push,
  			     const struct argv_array *ref_prefixes,
 -			     const struct string_list *server_options)
 +			     const struct string_list *server_options,
 +			     int stateless_rpc)
  {
  	int i;
+ 	const char *hash_name;
  	*list = NULL;
  
  	if (server_supports_v2("ls-refs", 1))
diff --cc upload-pack.c
index 39d0cf00be,df6cb51db7..951a2b23aa
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -1131,17 -1004,18 +1131,18 @@@ static int send_ref(const char *refname
  	if (capabilities) {
  		struct strbuf symref_info = STRBUF_INIT;
  
 -		format_symref_info(&symref_info, cb_data);
 +		format_symref_info(&symref_info, &data->symref);
- 		packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
+ 		packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s object-format=%s agent=%s\n",
  			     oid_to_hex(oid), refname_nons,
  			     0, capabilities,
 -			     (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
 +			     (data->allow_uor & ALLOW_TIP_SHA1) ?
  				     " allow-tip-sha1-in-want" : "",
 -			     (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
 +			     (data->allow_uor & ALLOW_REACHABLE_SHA1) ?
  				     " allow-reachable-sha1-in-want" : "",
 -			     stateless_rpc ? " no-done" : "",
 +			     data->stateless_rpc ? " no-done" : "",
  			     symref_info.buf,
 -			     allow_filter ? " filter" : "",
 +			     data->allow_filter ? " filter" : "",
+ 			     the_hash_algo->name,
  			     git_user_agent_sanitized());
  		strbuf_release(&symref_info);
  	} else {