Autogenerated HTML docs for v2.31.1-621-g97eea

19 files changed, 105 insertions, 17 deletions

diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt
index b562eda2d..8f7bacc67 100644
--- a/RelNotes/2.32.0.txt
+++ b/RelNotes/2.32.0.txt
@@ -121,6 +121,9 @@ UI, Workflows & Features
    same goal in a safer and more intuitive way has been added, as
    the trailer.<token>.cmd configuration variable, to replace it.
 
+ * "git add -i --dry-run" does not dry-run, which was surprising.  The
+   combination of options has taught to error out.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -195,6 +198,9 @@ Performance, Internal Implementation, Development Support etc.
 
  * The reflog expiry machinery has been taught to emit trace events.
 
+ * Over-the-wire protocol learns a new request type to ask for object
+   sizes given a list of object names.
+
 
 Fixes since v2.31
 -----------------
@@ -345,6 +351,13 @@ Fixes since v2.31
  * Document that our test can use "local" keyword.
    (merge a84fd3bcc6 jc/test-allows-local later to maint).
 
+ * The word-diff mode has been taught to work better with a word
+   regexp that can match an empty string.
+   (merge 0324e8fc6b pw/word-diff-zero-width-matches later to maint).
+
+ * "git p4" learned to find branch points more efficiently.
+   (merge 6b79818bfb jk/p4-locate-branch-point-optim later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f451960708 dl/cat-file-doc-cleanup later to maint).
    (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
@@ -364,3 +377,5 @@ Fixes since v2.31
    (merge 151b6c2dd7 jc/doc-do-not-capitalize-clarification later to maint).
    (merge 9160068ac6 js/access-nul-emulation-on-windows later to maint).
    (merge 7a14acdbe6 po/diff-patch-doc later to maint).
+   (merge f91371b948 pw/patience-diff-clean-up later to maint).
+   (merge 3a7f0908b6 mt/clean-clean later to maint).
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 828e3bc72..e838096e3 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:20 JST

+ 2021-05-14 08:56:44 JST

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 59aca2c92..2b162309c 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:20 JST

+ 2021-05-14 08:56:44 JST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 32890e446..42af12699 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:20 JST

+ 2021-05-14 08:56:44 JST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 33de6abae..ad24a4208 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:14 JST

+ 2021-05-14 08:56:40 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 256625cd5..f6edd516b 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:19 JST

+ 2021-05-14 08:56:44 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index ab72b7766..77f60e84d 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:19 JST

+ 2021-05-14 08:56:44 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index f5aca8a8d..b73a34901 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:18 JST

+ 2021-05-14 08:56:43 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index ba3d17639..a00d9d5e3 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:19 JST

+ 2021-05-14 08:56:43 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 357088a2e..456736248 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:18 JST

+ 2021-05-14 08:56:43 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index e1dfc4adb..b2a06f1cc 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:14 JST

+ 2021-05-14 08:56:41 JST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 11dec9dec..e2be7c71b 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:17 JST

+ 2021-05-14 08:56:42 JST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 20719c7be..427e90fa1 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:17 JST

+ 2021-05-14 08:56:42 JST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index e341a2426..ce75e82b7 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:16 JST

+ 2021-05-14 08:56:42 JST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 2942305fc..abe27aad1 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:16 JST

+ 2021-05-14 08:56:42 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index ff2498907..af3190c14 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:15 JST

+ 2021-05-14 08:56:41 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 4976df447..a7631be6a 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-12 14:19:15 JST

+ 2021-05-14 08:56:41 JST

 </div>

 </div>

 </body>

diff --git a/technical/protocol-v2.html b/technical/protocol-v2.html
index 70a0a2122..8f64ac868 100644
--- a/technical/protocol-v2.html
+++ b/technical/protocol-v2.html
@@ -1405,6 +1405,48 @@ current implementation uses trace2 session IDs (see
 <a href="api-trace2.html">api-trace2</a> for details), but this may change and users of

 the session ID should not rely on this fact.</p></div>

 </div>

+<div class="sect2">

+<h3 id="_object_info">object-info</h3>

+<div class="paragraph"><p><code>object-info</code> is the command to retrieve information about one or more objects.

+Its main purpose is to allow a client to make decisions based on this

+information without having to fully fetch objects. Object size is the only

+information that is currently supported.</p></div>

+<div class="paragraph"><p>An <code>object-info</code> request takes the following arguments:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>size

+Requests size information to be returned for each listed object id.</code></pre>

+</div></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>oid &lt;oid&gt;

+Indicates to the server an object which the client wants to obtain

+information for.</code></pre>

+</div></div>

+<div class="paragraph"><p>The response of <code>object-info</code> is a list of the the requested object ids

+and associated requested information, each separated by a single space.</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>output = info flush-pkt</code></pre>

+</div></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>info = PKT-LINE(attrs) LF)

+        *PKT-LINE(obj-info LF)</code></pre>

+</div></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>attrs = attr | attrs SP attrs</code></pre>

+</div></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>attr = "size"</code></pre>

+</div></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>obj-info = obj-id SP obj-size</code></pre>

+</div></div>

+</div>

 </div>

 </div>

 </div>

@@ -1412,7 +1454,7 @@ the session ID should not rely on this fact.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-26 10:29:29 JST

+ 2021-05-14 08:55:43 JST

 </div>

 </div>

 </body>

diff --git a/technical/protocol-v2.txt b/technical/protocol-v2.txt
index a7c806a73..f4ed14177 100644
--- a/technical/protocol-v2.txt
+++ b/technical/protocol-v2.txt
@@ -514,3 +514,34 @@ packet-line, and must not contain non-printable or whitespace characters. The
 current implementation uses trace2 session IDs (see
 link:api-trace2.html[api-trace2] for details), but this may change and users of
 the session ID should not rely on this fact.
+
+object-info
+~~~~~~~~~~~
+
+`object-info` is the command to retrieve information about one or more objects.
+Its main purpose is to allow a client to make decisions based on this
+information without having to fully fetch objects. Object size is the only
+information that is currently supported.
+
+An `object-info` request takes the following arguments:
+
+	size
+	Requests size information to be returned for each listed object id.
+
+	oid <oid>
+	Indicates to the server an object which the client wants to obtain
+	information for.
+
+The response of `object-info` is a list of the the requested object ids
+and associated requested information, each separated by a single space.
+
+	output = info flush-pkt
+
+	info = PKT-LINE(attrs) LF)
+		*PKT-LINE(obj-info LF)
+
+	attrs = attr | attrs SP attrs
+
+	attr = "size"
+
+	obj-info = obj-id SP obj-size