From: Taylor Blau <me@ttaylorr.com>
Date: Tue, 15 Oct 2024 20:56:43 +0000 (-0400)
Subject: Merge branch 'xx/remote-server-option-config'
X-Git-Tag: v2.48.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd98f659fda5a7704b10033f2b2efdae2b0a58e6;p=thirdparty%2Fgit.git

Merge branch 'xx/remote-server-option-config'

A new configuration variable remote.<name>.serverOption makes the
transport layer act as if the --serverOption=<value> option is
given from the command line.

* xx/remote-server-option-config:
  ls-remote: leakfix for not clearing server_options
  fetch: respect --server-option when fetching multiple remotes
  transport.c::handshake: make use of server options from remote
  remote: introduce remote.<name>.serverOption configuration
  transport: introduce parse_transport_option() method
---

fd98f659fda5a7704b10033f2b2efdae2b0a58e6
diff --cc Documentation/git-clone.txt
index 9c13f847da,409fb3a3af..116ad64820
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -147,8 -147,11 +147,11 @@@ objects from the source repository int
  	protocol version 2.  The given string must not contain a NUL or LF
  	character.  The server's handling of server options, including
  	unknown ones, is server-specific.
 -	When multiple ++--server-option=++__<option>__ are given, they are all
 +	When multiple `--server-option=<option>` are given, they are all
  	sent to the other side in the order listed on the command line.
+ 	When no ++--server-option=++__<option>__ is given from the command
+ 	line, the values of configuration variable `remote.<name>.serverOption`
+ 	are used instead.
  
  `-n`::
  `--no-checkout`::