Autogenerated HTML docs for v2.44.0-165-ge09f12

git · Mar 8, 2024 · d2c69b6 · d2c69b6
1 parent e137439
commit d2c69b6
Show file tree

Hide file tree

Showing 57 changed files with 207 additions and 82 deletions.
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Object Walk</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt
@@ -24,6 +24,16 @@ UI, Workflows & Features
  * "git for-each-ref" learned "--include-root-refs" option to show
    even the stuff outside the 'refs/' hierarchy.
 
+ * "git rev-list --missing=print" has learned to optionally take
+   "--allow-missing-tips", which allows the objects at the starting
+   points to be missing.
+
+ * "git merge-tree" has learned that the three trees involved in the
+   3-way merge only need to be trees, not necessarily commits.
+
+ * "git log --merge" learned to pay attention to CHERRY_PICK_HEAD and
+   other kinds of *_HEAD pseudorefs.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -40,6 +50,10 @@ Performance, Internal Implementation, Development Support etc.
    specified; use "_<placeholder>_" to typeset the word inside a pair
    of <angle-brakets> emphasized.
 
+ * "git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy
+   fetching of objects from the promisor remote, which may be handy
+   for debugging.
+
 
 Fixes since v2.44
 -----------------
@@ -94,6 +108,25 @@ Fixes since v2.44
    to be the first header file.
    (merge 4e89f0e07c jc/doc-compat-util later to maint).
 
+ * "git commit -v --cleanup=scissors" used to add the scissors line
+   twice in the log message buffer, which has been corrected.
+   (merge e90cc075cc jt/commit-redundant-scissors-fix later to maint).
+
+ * A custom remote helper no longer cannot access the newly created
+   repository during "git clone", which is a regression in Git 2.44.
+   This has been corrected.
+   (merge 199f44cb2e ps/remote-helper-repo-initialization-fix later to maint).
+
+ * Various parts of upload-pack has been updated to bound the resource
+   consumption relative to the size of the repository to protect from
+   abusive clients.
+   (merge 6cd05e768b jk/upload-pack-bounded-resources later to maint).
+
+ * The upload-pack program, when talking over v2, accepted the
+   packfile-uris protocol extension from the client, even if it did
+   not advertise the capability, which has been corrected.
+   (merge a922bfa3b5 jk/upload-pack-v2-capability-cleanup later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f0e578c69c rs/use-xstrncmpz later to maint).
    (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).
@@ -108,3 +141,4 @@ Fixes since v2.44
    (merge f39addd0d9 rs/name-rev-with-mempool later to maint).
    (merge 9a97b43e03 rs/submodule-prefix-simplify later to maint).
    (merge 40b8076462 ak/rebase-autosquash later to maint).
+   (merge 3223204456 eg/add-uflags later to maint).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/SubmittingPatches.html b/SubmittingPatches.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Submitting Patches</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/ToolsForGit.html b/ToolsForGit.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Tools for developing Git</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/everyday.html b/everyday.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-config.html b/git-config.html
@@ -11548,6 +11548,15 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+transfer.advertiseObjectInfo
+</dt>
+<dd>
+<p>
+        When <code>true</code>, the <code>object-info</code> capability is advertised by
+        servers. Defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
 uploadarchive.allowUnreachable
 </dt>
 <dd>

diff --git a/git-log.html b/git-log.html
@@ -1534,8 +1534,11 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
 </dt>
 <dd>
 <p>
-        After a failed merge, show refs that touch files having a
-        conflict and don&#8217;t exist on all heads to merge.
+        Show commits touching conflicted paths in the range <code>HEAD...&lt;other&gt;</code>,
+        where <code>&lt;other&gt;</code> is the first existing pseudoref in <code>MERGE_HEAD</code>,
+        <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works
+        when the index has unmerged entries. This option can be used to show
+        relevant commits when resolving conflicts from a 3-way merge.
 </p>
 </dd>
 <dt class="hdlist1">

diff --git a/git-merge-tree.html b/git-merge-tree.html
@@ -847,14 +847,16 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
---merge-base=&lt;commit&gt;
+--merge-base=&lt;tree-ish&gt;
 </dt>
 <dd>
 <p>
         Instead of finding the merge-bases for &lt;branch1&gt; and &lt;branch2&gt;,
         specify a merge-base for the merge, and specifying multiple bases is
         currently not supported. This option is incompatible with <code>--stdin</code>.
 </p>
+<div class="paragraph"><p>As the merge-base is provided directly, &lt;branch1&gt; and &lt;branch2&gt; do not need
+to specify commits; trees are enough.</p></div>
 </dd>
 </dl></div>
 </div>
@@ -1152,7 +1154,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2024-03-07 16:01:15 PST
 </div>
 </div>
 </body>

diff --git a/git-merge-tree.txt b/git-merge-tree.txt
@@ -64,10 +64,13 @@ OPTIONS
 	share no common history.  This flag can be given to override that
 	check and make the merge proceed anyway.
 
---merge-base=<commit>::
+--merge-base=<tree-ish>::
 	Instead of finding the merge-bases for <branch1> and <branch2>,
 	specify a merge-base for the merge, and specifying multiple bases is
 	currently not supported. This option is incompatible with `--stdin`.
++
+As the merge-base is provided directly, <branch1> and <branch2> do not need
+to specify commits; trees are enough.
 
 [[OUTPUT]]
 OUTPUT

diff --git a/git-remote-helpers.html b/git-remote-helpers.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>git-remote-helpers</h1>
-<span id="revdate">2024-03-05</span>
+<span id="revdate">2024-03-07</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-replay.html b/git-replay.html
@@ -1348,8 +1348,11 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
 </dt>
 <dd>
 <p>
-        After a failed merge, show refs that touch files having a
-        conflict and don&#8217;t exist on all heads to merge.
+        Show commits touching conflicted paths in the range <code>HEAD...&lt;other&gt;</code>,
+        where <code>&lt;other&gt;</code> is the first existing pseudoref in <code>MERGE_HEAD</code>,
+        <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works
+        when the index has unmerged entries. This option can be used to show
+        relevant commits when resolving conflicts from a 3-way merge.
 </p>
 </dd>
 <dt class="hdlist1">

diff --git a/git-rev-list.html b/git-rev-list.html
@@ -1370,8 +1370,11 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
 </dt>
 <dd>
 <p>
-        After a failed merge, show refs that touch files having a
-        conflict and don&#8217;t exist on all heads to merge.
+        Show commits touching conflicted paths in the range <code>HEAD...&lt;other&gt;</code>,
+        where <code>&lt;other&gt;</code> is the first existing pseudoref in <code>MERGE_HEAD</code>,
+        <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works
+        when the index has unmerged entries. This option can be used to show
+        relevant commits when resolving conflicts from a 3-way merge.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -2238,6 +2241,9 @@ <h3 id="_object_traversal">Object Traversal</h3>
 Unexpected missing objects will raise an error.</p></div>
 <div class="paragraph"><p>The form <em>--missing=print</em> is like <em>allow-any</em>, but will also print a
 list of the missing objects.  Object IDs are prefixed with a &#8220;?&#8221; character.</p></div>
+<div class="paragraph"><p>If some tips passed to the traversal are missing, they will be
+considered as missing too, and the traversal will ignore them. In case
+we cannot get their Object ID though, an error will be raised.</p></div>
 </dd>
 <dt class="hdlist1">
 --exclude-promisor-objects

diff --git a/git-shortlog.html b/git-shortlog.html
@@ -1473,8 +1473,11 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
 </dt>
 <dd>
 <p>
-        After a failed merge, show refs that touch files having a
-        conflict and don&#8217;t exist on all heads to merge.
+        Show commits touching conflicted paths in the range <code>HEAD...&lt;other&gt;</code>,
+        where <code>&lt;other&gt;</code> is the first existing pseudoref in <code>MERGE_HEAD</code>,
+        <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works
+        when the index has unmerged entries. This option can be used to show
+        relevant commits when resolving conflicts from a 3-way merge.
 </p>
 </dd>
 <dt class="hdlist1">

diff --git a/git.html b/git.html
@@ -998,8 +998,22 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Do not use replacement refs to replace Git objects. See
-        <a href="git-replace.html">git-replace(1)</a> for more information.
+        Do not use replacement refs to replace Git objects.
+        This is equivalent to exporting the <code>GIT_NO_REPLACE_OBJECTS</code>
+        environment variable with any value.
+        See <a href="git-replace.html">git-replace(1)</a> for more information.
+</p>
+</dd>
+<dt class="hdlist1">
+--no-lazy-fetch
+</dt>
+<dd>
+<p>
+        Do not fetch missing objects from the promisor remote on
+        demand.  Useful together with <code>git cat-file -e &lt;object&gt;</code> to
+        see if the object is locally available.
+        This is equivalent to setting the <code>GIT_NO_LAZY_FETCH</code>
+        environment variable to <code>1</code>.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -3545,6 +3559,15 @@ <h3 id="_other">other</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+<code>GIT_NO_REPLACE_OBJECTS</code>
+</dt>
+<dd>
+<p>
+        Setting and exporting this environment variable tells Git to
+        ignore replacement refs and do not replace Git objects.
+</p>
+</dd>
+<dt class="hdlist1">
 <code>GIT_LITERAL_PATHSPECS</code>
 </dt>
 <dd>
@@ -3586,6 +3609,16 @@ <h3 id="_other">other</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+<code>GIT_NO_LAZY_FETCH</code>
+</dt>
+<dd>
+<p>
+        Setting this Boolean environment variable to true tells Git
+        not to lazily fetch missing objects from the promisor remote
+        on demand.
+</p>
+</dd>
+<dt class="hdlist1">
 <code>GIT_REFLOG_ACTION</code>
 </dt>
 <dd>
@@ -3846,7 +3879,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-02-08 15:45:59 PST
+ 2024-03-07 16:01:15 PST
 </div>
 </div>
 </body>

diff --git a/git.txt b/git.txt
@@ -174,8 +174,17 @@ If you just want to run git as if it was started in `<path>` then use
 	directory.
 
 --no-replace-objects::
-	Do not use replacement refs to replace Git objects. See
-	linkgit:git-replace[1] for more information.
+	Do not use replacement refs to replace Git objects.
+	This is equivalent to exporting the `GIT_NO_REPLACE_OBJECTS`
+	environment variable with any value.
+	See linkgit:git-replace[1] for more information.
+
+--no-lazy-fetch::
+	Do not fetch missing objects from the promisor remote on
+	demand.  Useful together with `git cat-file -e <object>` to
+	see if the object is locally available.
+	This is equivalent to setting the `GIT_NO_LAZY_FETCH`
+	environment variable to `1`.
 
 --literal-pathspecs::
 	Treat pathspecs literally (i.e. no globbing, no pathspec magic).
@@ -872,6 +881,10 @@ for full details.
 	header and packfile URIs. Set this Boolean environment variable to false to prevent this
 	redaction.
 
+`GIT_NO_REPLACE_OBJECTS`::
+	Setting and exporting this environment variable tells Git to
+	ignore replacement refs and do not replace Git objects.
+
 `GIT_LITERAL_PATHSPECS`::
 	Setting this Boolean environment variable to true will cause Git to treat all
 	pathspecs literally, rather than as glob patterns. For example,
@@ -893,6 +906,11 @@ for full details.
 	Setting this Boolean environment variable to true will cause Git to treat all
 	pathspecs as case-insensitive.
 
+`GIT_NO_LAZY_FETCH`::
+	Setting this Boolean environment variable to true tells Git
+	not to lazily fetch missing objects from the promisor remote
+	on demand.
+
 `GIT_REFLOG_ACTION`::
 	When a ref is updated, reflog entries are created to keep
 	track of the reason why the ref was updated (which is

diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html
@@ -1157,7 +1157,8 @@ <h3 id="_fetch">fetch</h3>
 <pre><code>want-ref &lt;ref&gt;
     Indicates to the server that the client wants to retrieve a
     particular ref, where &lt;ref&gt; is the full name of a ref on the
-    server.</code></pre>
+    server.  It is a protocol error to send want-ref for the
+    same ref more than once.</code></pre>
 </div></div>
 <div class="paragraph"><p>If the <em>sideband-all</em> feature is advertised, the following argument can be
 included in the client&#8217;s request:</p></div>
@@ -1173,7 +1174,8 @@ <h3 id="_fetch">fetch</h3>
 <div class="paragraph"><p>If the <em>packfile-uris</em> feature is advertised, the following argument
 can be included in the client&#8217;s request as well as the potential
 addition of the <em>packfile-uris</em> section in the server&#8217;s response as
-explained below.</p></div>
+explained below. Note that at most one <code>packfile-uris</code> line can be sent
+to the server.</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><code>packfile-uris &lt;comma-separated-list-of-protocols&gt;
@@ -1719,7 +1721,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-02-08 15:45:59 PST
+ 2024-03-07 16:01:15 PST
 </div>
 </div>
 </body>