From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 May 2021 12:05:22 +0000 (+0900)
Subject: Merge branch 'jt/push-negotiation'
X-Git-Tag: v2.32.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=644f4a20468da89c1325a539c0521336f7835a64;p=thirdparty%2Fgit.git

Merge branch 'jt/push-negotiation'

"git push" learns to discover common ancestor with the receiving
end over protocol v2.

* jt/push-negotiation:
  send-pack: support push negotiation
  fetch: teach independent negotiation (no packfile)
  fetch-pack: refactor command and capability write
  fetch-pack: refactor add_haves()
  fetch-pack: refactor process_acks()
---

644f4a20468da89c1325a539c0521336f7835a64
diff --cc t/t5701-git-serve.sh
index 73e74a9c54,f03bb04803..930721f053
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@@ -16,10 -16,9 +16,10 @@@ test_expect_success 'test capability ad
  	version 2
  	agent=git/$(git version | cut -d" " -f3)
  	ls-refs=unborn
- 	fetch=shallow
+ 	fetch=shallow wait-for-done
  	server-option
  	object-format=$(test_oid algo)
 +	object-info
  	0000
  	EOF