From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2026 01:21:55 +0000 (+0900)
Subject: Merge branch 'ds/fetch-negotiation-options' into seen
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=189a9c5e5d1284f2ffcb308fb850d77a14557e64;p=thirdparty%2Fgit.git

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

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
  remote: add remote.*.negotiationRestrict config
  transport: rename negotiation_tips
  fetch: add --negotiation-restrict option
  t5516: fix test order flakiness
---

189a9c5e5d1284f2ffcb308fb850d77a14557e64
diff --cc fetch-pack.c
index c8fa0a609a,8b080b0080..3ec53a672d
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -1884,8 -1974,8 +1976,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;
  }