summaryrefslogtreecommitdiffstats
path: root/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 14:35:54 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-23 14:35:54 -0700
commiteb4d567e7d4be3b673ecb1b77c89eef87fbbe48d (patch)
tree6e670971ae46d00fcae30de77c12521f083b641b /technical
parentde44de3d9e71db785a0bbd06a6ddad8d2c38dd67 (diff)
downloadgit-htmldocs-eb4d567e7d4be3b673ecb1b77c89eef87fbbe48d.tar.gz
Autogenerated HTML docs for v2.33.0-591-gddb10
Diffstat (limited to 'technical')
-rw-r--r--technical/api-parse-options.html12
-rw-r--r--technical/api-parse-options.txt5
-rw-r--r--technical/protocol-v2.html11
-rw-r--r--technical/protocol-v2.txt8
4 files changed, 16 insertions, 20 deletions
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html
index 16293e240..93e5aad51 100644
--- a/technical/api-parse-options.html
+++ b/technical/api-parse-options.html
@@ -1103,16 +1103,6 @@ There are some macros to easily define options:</p></div>
</p>
</dd>
<dt class="hdlist1">
-<code>OPT_ARGUMENT(long, &amp;int_var, description)</code>
-</dt>
-<dd>
-<p>
- Introduce a long-option argument that will be kept in <code>argv[]</code>.
- If this option was seen, <code>int_var</code> will be set to one (except
- if a <code>NULL</code> pointer was passed).
-</p>
-</dd>
-<dt class="hdlist1">
<code>OPT_NUMBER_CALLBACK(&amp;var, description, func_ptr)</code>
</dt>
<dd>
@@ -1290,7 +1280,7 @@ for real-world examples.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-08-10 16:45:05 PDT
+ 2021-09-23 14:33:59 PDT
</div>
</div>
</body>
diff --git a/technical/api-parse-options.txt b/technical/api-parse-options.txt
index 5a60bbfa7..acfd5dc1d 100644
--- a/technical/api-parse-options.txt
+++ b/technical/api-parse-options.txt
@@ -198,11 +198,6 @@ There are some macros to easily define options:
The filename will be prefixed by passing the filename along with
the prefix argument of `parse_options()` to `prefix_filename()`.
-`OPT_ARGUMENT(long, &int_var, description)`::
- Introduce a long-option argument that will be kept in `argv[]`.
- If this option was seen, `int_var` will be set to one (except
- if a `NULL` pointer was passed).
-
`OPT_NUMBER_CALLBACK(&var, description, func_ptr)`::
Recognize numerical options like -123 and feed the integer as
if it was an argument to the function given by `func_ptr`.
diff --git a/technical/protocol-v2.html b/technical/protocol-v2.html
index 7e498db46..a925fad28 100644
--- a/technical/protocol-v2.html
+++ b/technical/protocol-v2.html
@@ -818,7 +818,8 @@ commands be executed.</p></div>
<div class="paragraph"><p>In general a client can request to speak protocol v2 by sending
<code>version=2</code> through the respective side-channel for the transport being
used which inevitably sets <code>GIT_PROTOCOL</code>. More information can be
-found in <code>pack-protocol.txt</code> and <code>http-protocol.txt</code>. In all cases the
+found in <code>pack-protocol.txt</code> and <code>http-protocol.txt</code>, as well as the
+<code>GIT_PROTOCOL</code> definition in <code>git.txt</code>. In all cases the
response from the server is the capability advertisement.</p></div>
<div class="sect2">
<h3 id="_git_transport">Git Transport</h3>
@@ -832,7 +833,9 @@ sending "version=2" as an extra parameter:</p></div>
<div class="sect2">
<h3 id="_ssh_and_file_transport">SSH and File Transport</h3>
<div class="paragraph"><p>When using either the ssh:// or file:// transport, the GIT_PROTOCOL
-environment variable must be set explicitly to include "version=2".</p></div>
+environment variable must be set explicitly to include "version=2".
+The server may need to be configured to allow this environment variable
+to pass.</p></div>
</div>
<div class="sect2">
<h3 id="_http_transport">HTTP Transport</h3>
@@ -858,6 +861,8 @@ S: &lt;capability-advertisement&gt;</code></pre>
<code>$GIT_URL/git-upload-pack</code>. (This works the same for git-receive-pack).</p></div>
<div class="paragraph"><p>Uses the <code>--http-backend-info-refs</code> option to
<a href="../git-upload-pack.html">git-upload-pack(1)</a>.</p></div>
+<div class="paragraph"><p>The server may need to be configured to pass this header&#8217;s contents via
+the <code>GIT_PROTOCOL</code> variable. See the discussion in <code>git-http-backend.txt</code>.</p></div>
</div>
</div>
</div>
@@ -1465,7 +1470,7 @@ and associated requested information, each separated by a single space.</p></div
<div id="footer">
<div id="footer-text">
Last updated
- 2021-09-20 15:44:03 PDT
+ 2021-09-23 14:33:59 PDT
</div>
</div>
</body>
diff --git a/technical/protocol-v2.txt b/technical/protocol-v2.txt
index 213538f1d..59b86fcf9 100644
--- a/technical/protocol-v2.txt
+++ b/technical/protocol-v2.txt
@@ -42,7 +42,8 @@ Initial Client Request
In general a client can request to speak protocol v2 by sending
`version=2` through the respective side-channel for the transport being
used which inevitably sets `GIT_PROTOCOL`. More information can be
-found in `pack-protocol.txt` and `http-protocol.txt`. In all cases the
+found in `pack-protocol.txt` and `http-protocol.txt`, as well as the
+`GIT_PROTOCOL` definition in `git.txt`. In all cases the
response from the server is the capability advertisement.
Git Transport
@@ -58,6 +59,8 @@ SSH and File Transport
When using either the ssh:// or file:// transport, the GIT_PROTOCOL
environment variable must be set explicitly to include "version=2".
+The server may need to be configured to allow this environment variable
+to pass.
HTTP Transport
~~~~~~~~~~~~~~
@@ -84,6 +87,9 @@ Subsequent requests are then made directly to the service
Uses the `--http-backend-info-refs` option to
linkgit:git-upload-pack[1].
+The server may need to be configured to pass this header's contents via
+the `GIT_PROTOCOL` variable. See the discussion in `git-http-backend.txt`.
+
Capability Advertisement
------------------------