Merge branch 'ds/fetch-negotiation-options' into next

The negotiation tip options in "git fetch" have been reworked to
allow requiring certain refs to be sent as "have" lines, and to
restrict negotiation to a specific set of refs.

* ds/fetch-negotiation-options:
  send-pack: pass negotiation config in push
  remote: add remote.*.negotiationInclude config
  fetch: add --negotiation-include option for negotiation
  negotiator: add have_sent() interface
  remote: add remote.*.negotiationRestrict config
  transport: rename negotiation_tips
  fetch: add --negotiation-restrict option
  t5516: fix test order flakiness

diff --cc builtin/fetch.c
Simple merge

diff --cc fetch-pack.c
index c8fa0a609ac6de3083e06c79233a01213f23a4ae,96071434b88fa568eb17422e715bea96e88965d5..120e01f3cf26740ffc896c12eb4a9d233603e89f
--- 1/fetch-pack.c
--- 2/fetch-pack.c
+++ b/fetch-pack.c
@@@ -1884,8 -1943,8 +1945,9 @@@ static struct ref *do_fetch_pack_v2(str
        if (negotiator)
                negotiator->release(negotiator);
  
 +      fsck_options_clear(&fsck_options);
        oidset_clear(&common);
+       oidset_clear(&negotiation_include_oids);
        return ref;
  }
  

diff --cc negotiator/default.c
Simple merge

diff --cc negotiator/skipping.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc send-pack.c
Simple merge

diff --cc t/t5510-fetch.sh
Simple merge

diff --cc t/t5516-fetch-push.sh
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge