Autogenerated HTML docs for v2.40.0-130-g27d43

26 files changed, 121 insertions, 16 deletions

diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index d6095a5df..5db6f1b0e 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -27,6 +27,14 @@ UI, Workflows & Features
  * "git format-patch" learned to write a log-message only output file
    for empty commits.
 
+ * "git format-patch" honors the src/dst prefixes set to nonstandard
+   values with configuration variables like "diff.noprefix", causing
+   receiving end of the patch that expects the standard -p1 format to
+   break.  "format-patch" has been taught to ignore end-user configuration
+   and always use the standard prefixes.
+
+   This is a backward compatibility breaking change.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -84,5 +92,15 @@ Fixes since v2.40
    corrected.
    (merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
 
+ * Fix for a "ls-files --format="%(path)" that produced nonsense
+   output, which was a bug in 2.38.
+   (merge cfb62dd006 aj/ls-files-format-fix later to maint).
+
+ * "git receive-pack" that responds to "git push" requests failed to
+   clean a stale lockfile when killed in the middle, which has been
+   corrected.
+   (merge c55c30669c ps/receive-pack-unlock-before-die later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f7111175df as/doc-markup-fix later to maint).
+   (merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
diff --git a/diff-options.txt b/diff-options.txt
index 7d73e976d..08ab86189 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -852,6 +852,11 @@ endif::git-format-patch[]
 --no-prefix::
 	Do not show any source or destination prefix.
 
+--default-prefix::
+	Use the default source and destination prefixes ("a/" and "b/").
+	This is usually the default already, but may be used to override
+	config such as `diff.noprefix`.
+
 --line-prefix=<prefix>::
 	Prepend an additional prefix to every line of output.
 
diff --git a/git-config.html b/git-config.html
index 2fe8acb03..5988cbb6d 100644
--- a/git-config.html
+++ b/git-config.html
@@ -5902,6 +5902,18 @@ format.mboxrd
 </p>

 </dd>

 <dt class="hdlist1">

+format.noprefix

+</dt>

+<dd>

+<p>

+        If set, do not show any source or destination prefix in patches.

+        This is equivalent to the <code>diff.noprefix</code> option used by <code>git

+        diff</code> (but which is not respected by <code>format-patch</code>). Note that

+        by setting this, the receiver of any patches you generate will

+        have to apply them using the <code>-p0</code> option.

+</p>

+</dd>

+<dt class="hdlist1">

 filter.&lt;driver&gt;.clean

 </dt>

 <dd>

diff --git a/git-diff-files.html b/git-diff-files.html
index 1ab44ae19..6d25d70dc 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -2017,6 +2017,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-diff-index.html b/git-diff-index.html
index ead7f0e9f..040227ce2 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -2018,6 +2018,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 55c5a454b..277451c74 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -2019,6 +2019,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-diff.html b/git-diff.html
index 433a7935a..ab4c28d66 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2155,6 +2155,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-format-patch.html b/git-format-patch.html
index 520db4fa4..3dc9c00a4 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1600,6 +1600,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-log.html b/git-log.html
index d40a02e99..16ef4ee78 100644
--- a/git-log.html
+++ b/git-log.html
@@ -4871,6 +4871,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/git-show.html b/git-show.html
index d5d3d4c77..178feeb0b 100644
--- a/git-show.html
+++ b/git-show.html
@@ -3333,6 +3333,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </p>

 </dd>

 <dt class="hdlist1">

+--default-prefix

+</dt>

+<dd>

+<p>

+        Use the default source and destination prefixes ("a/" and "b/").

+        This is usually the default already, but may be used to override

+        config such as <code>diff.noprefix</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --line-prefix=&lt;prefix&gt;

 </dt>

 <dd>

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index f90bbf109..ca7d80c68 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-03-19 15:17:29 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 2bb712cbc..183d13eaf 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

- 2023-03-19 15:17:29 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index a221efb92..2e73fbb45 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-03-19 15:17:29 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 9698ff16f..acaf4068e 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

- 2023-03-19 15:17:26 PDT

+ 2023-03-21 14:36:23 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 380b4463f..0fb0cfac5 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 976b4f3d2..ba505da61 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 5009acde6..b82c4f70c 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index f7f2cf887..20f6027d3 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:25 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 4282130f3..723c23155 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 364beb03d..7f6eec9f0 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:23 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 7606719f0..a7fb97ec6 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

- 2023-03-19 15:17:28 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 2726038f9..55396f038 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 15631e406..fcb42f5d9 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 86789e921..f376a181f 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index f358fc160..c4f1de47b 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:23 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 8ce73f0f5..991f0b2ff 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

- 2023-03-19 15:17:27 PDT

+ 2023-03-21 14:36:24 PDT

 </div>

 </div>

 </body>