Autogenerated HTML docs for v2.28.0-337-ge9b77

29 files changed, 122 insertions, 32 deletions

diff --git a/RelNotes/2.29.0.txt b/RelNotes/2.29.0.txt
index 88e03eb23..a5e0ffd4b 100644
--- a/RelNotes/2.29.0.txt
+++ b/RelNotes/2.29.0.txt
@@ -37,6 +37,16 @@ UI, Workflows & Features
    placed by the sequencer machinery have been made more readable by
    humans.
 
+ * The "--batch-size" option of "git multi-pack-index repack" command
+   is now used to specify that very small packfiles are collected into
+   one until the total size roughly exceeds it.
+
+ * The recent addition of SHA-256 support is marked as experimental in
+   the documentation.
+
+ * "git fetch" learned --no-write-fetch-head option to avoid writing
+   the FETCH_HEAD file.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -183,6 +193,29 @@ Fixes since v2.28
  * "unlink" emulation on MinGW has been optimized.
    (merge 680e0b4524 jh/mingw-unlink later to maint).
 
+ * The purpose of "git init --separate-git-dir" is to initialize a
+   new project with the repository separate from the working tree,
+   or, in the case of an existing project, to move the repository
+   (the .git/ directory) out of the working tree. It does not make
+   sense to use --separate-git-dir with a bare repository for which
+   there is no working tree, so disallow its use with bare
+   repositories.
+   (merge ccf236a23a es/init-no-separate-git-dir-in-bare later to maint).
+
+ * "ls-files -o" mishandled the top-level directory of another git
+   working tree that hangs in the current git working tree.
+   (merge ab282aa548 en/dir-nonbare-embedded later to maint).
+
+ * Fix some incorrect UNLEAK() annotations.
+   (merge 3e19816dc0 jk/unleak-fixes later to maint).
+
+ * Use more buffered I/O where we used to call many small write(2)s.
+   (merge a698d67b08 rs/more-buffered-io later to maint).
+
+ * The patch-id computation did not ignore the "incomplete last line"
+   marker like whitespaces.
+   (merge 82a62015a7 rs/patch-id-with-incomplete-line later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 84544f2ea3 sk/typofixes later to maint).
    (merge b17f411ab5 ar/help-guides-doc later to maint).
@@ -202,3 +235,5 @@ Fixes since v2.28
    (merge a831908599 rs/preserve-merges-unused-code-removal later to maint).
    (merge 6dfefe70a9 jb/commit-graph-doc-fix later to maint).
    (merge 847b37271e pb/set-url-docfix later to maint).
+   (merge 748f733d54 mt/checkout-entry-dead-code-removal later to maint).
+   (merge ce820cbd58 dl/subtree-docs later to maint).
diff --git a/fetch-options.txt b/fetch-options.txt
index ff7062569..e8104c082 100644
--- a/fetch-options.txt
+++ b/fetch-options.txt
@@ -64,6 +64,15 @@ documented in linkgit:git-config[1].
 --dry-run::
 	Show what would be done, without making any changes.
 
+ifndef::git-pull[]
+--[no-]write-fetch-head::
+	Write the list of remote refs fetched in the `FETCH_HEAD`
+	file directly under `$GIT_DIR`.  This is the default.
+	Passing `--no-write-fetch-head` from the command line tells
+	Git not to write the file.  Under `--dry-run` option, the
+	file is never written.
+endif::git-pull[]
+
 -f::
 --force::
 	When 'git fetch' is used with `<src>:<dst>` refspec it may
diff --git a/git-fetch.html b/git-fetch.html
index 0189334e2..ea556bd28 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -901,6 +901,18 @@ documented in <a href="git-config.html">git-config(1)</a>.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--[no-]write-fetch-head

+</dt>

+<dd>

+<p>

+        Write the list of remote refs fetched in the <code>FETCH_HEAD</code>

+        file directly under <code>$GIT_DIR</code>.  This is the default.

+        Passing <code>--no-write-fetch-head</code> from the command line tells

+        Git not to write the file.  Under <code>--dry-run</code> option, the

+        file is never written.

+</p>

+</dd>

+<dt class="hdlist1">

 -f

 </dt>

 <dt class="hdlist1">

diff --git a/git-index-pack.html b/git-index-pack.html
index 7eb57229e..a36e36200 100644
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -909,6 +909,12 @@ objects/pack/ directory of a Git repository.</p></div>
         value is set or outside a repository.

 </p>

 <div class="paragraph"><p>This option cannot be used with --stdin.</p></div>

+<div class="paragraph"><p>THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still

+in an early stage.  A SHA-256 repository will in general not be able to

+share work with "regular" SHA-1 repositories.  It should be assumed

+that, e.g., Git internal file formats in relation to SHA-256

+repositories may change in backwards-incompatible ways.  Only use

+<code>--object-format=sha256</code> for testing purposes.</p></div>

 </dd>

 </dl></div>

 </div>

@@ -935,7 +941,7 @@ mentioned above.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-30 22:15:06 PDT

+ 2020-08-24 15:54:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-index-pack.txt b/git-index-pack.txt
index ac74d058e..af0c26232 100644
--- a/git-index-pack.txt
+++ b/git-index-pack.txt
@@ -100,6 +100,8 @@ OPTIONS
 	value is set or outside a repository.
 +
 This option cannot be used with --stdin.
++
+include::object-format-disclaimer.txt[]
 
 NOTES
 -----
diff --git a/git-init.html b/git-init.html
index 92c12082f..cf6a8629f 100644
--- a/git-init.html
+++ b/git-init.html
@@ -808,6 +808,12 @@ current working directory.
 Specify the given object format (hash algorithm) for the repository.  The valid

 values are <em>sha1</em> and (if enabled) <em>sha256</em>.  <em>sha1</em> is the default.

 </p>

+<div class="paragraph"><p>THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still

+in an early stage.  A SHA-256 repository will in general not be able to

+share work with "regular" SHA-1 repositories.  It should be assumed

+that, e.g., Git internal file formats in relation to SHA-256

+repositories may change in backwards-incompatible ways.  Only use

+<code>--object-format=sha256</code> for testing purposes.</p></div>

 </dd>

 <dt class="hdlist1">

 --template=&lt;template_directory&gt;

@@ -994,7 +1000,7 @@ Record the pristine state as the first commit in the history.
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-06 22:33:22 PDT

+ 2020-08-24 15:54:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-init.txt b/git-init.txt
index ddfe265da..f35f70f13 100644
--- a/git-init.txt
+++ b/git-init.txt
@@ -53,6 +53,8 @@ current working directory.
 
 Specify the given object format (hash algorithm) for the repository.  The valid
 values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default.
++
+include::object-format-disclaimer.txt[]
 
 --template=<template_directory>::
 
diff --git a/git-multi-pack-index.html b/git-multi-pack-index.html
index 51328ee3a..3108ebb48 100644
--- a/git-multi-pack-index.html
+++ b/git-multi-pack-index.html
@@ -827,11 +827,12 @@ repack
         multi-pack-index, then divide by the total number of objects in

         the pack and multiply by the pack size. We select packs with

         expected size below the batch size until the set of packs have

-        total expected size at least the batch size. If the total size

-        does not reach the batch size, then do nothing. If a new pack-

-        file is created, rewrite the multi-pack-index to reference the

-        new pack-file. A later run of <em>git multi-pack-index expire</em> will

-        delete the pack-files that were part of this batch.

+        total expected size at least the batch size, or all pack-files

+        are considered. If only one pack-file is selected, then do

+        nothing. If a new pack-file is created, rewrite the

+        multi-pack-index to reference the new pack-file. A later run of

+        <em>git multi-pack-index expire</em> will delete the pack-files that

+        were part of this batch.

 </p>

 <div class="paragraph"><p>If <code>repack.packKeptObjects</code> is <code>false</code>, then any pack-files with an

 associated <code>.keep</code> file will not be selected for the batch to repack.</p></div>

@@ -892,7 +893,7 @@ Format</a> for more information on the multi-pack-index feature.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-05-14 16:00:38 PDT

+ 2020-08-24 15:54:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-multi-pack-index.txt b/git-multi-pack-index.txt
index 0c6619493..eb0caa043 100644
--- a/git-multi-pack-index.txt
+++ b/git-multi-pack-index.txt
@@ -51,11 +51,12 @@ repack::
 	multi-pack-index, then divide by the total number of objects in
 	the pack and multiply by the pack size. We select packs with
 	expected size below the batch size until the set of packs have
-	total expected size at least the batch size. If the total size
-	does not reach the batch size, then do nothing. If a new pack-
-	file is created, rewrite the multi-pack-index to reference the
-	new pack-file. A later run of 'git multi-pack-index expire' will
-	delete the pack-files that were part of this batch.
+	total expected size at least the batch size, or all pack-files
+	are considered. If only one pack-file is selected, then do
+	nothing. If a new pack-file is created, rewrite the
+	multi-pack-index to reference the new pack-file. A later run of
+	'git multi-pack-index expire' will delete the pack-files that
+	were part of this batch.
 +
 If `repack.packKeptObjects` is `false`, then any pack-files with an
 associated `.keep` file will not be selected for the batch to repack.
diff --git a/git-show-index.html b/git-show-index.html
index 3e7369575..0a158ccd1 100644
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -803,6 +803,12 @@ index file itself, it&#8217;s both faster and more flexible.</p></div>
         algorithm for the current repository (set by <code>extensions.objectFormat</code>), or

         <em>sha1</em> if no value is set or outside a repository..

 </p>

+<div class="paragraph"><p>THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still

+in an early stage.  A SHA-256 repository will in general not be able to

+share work with "regular" SHA-1 repositories.  It should be assumed

+that, e.g., Git internal file formats in relation to SHA-256

+repositories may change in backwards-incompatible ways.  Only use

+<code>--object-format=sha256</code> for testing purposes.</p></div>

 </dd>

 </dl></div>

 </div>

@@ -818,7 +824,7 @@ index file itself, it&#8217;s both faster and more flexible.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-06 22:33:22 PDT

+ 2020-08-24 15:54:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-show-index.txt b/git-show-index.txt
index 39b1d8eaa..e49318a5a 100644
--- a/git-show-index.txt
+++ b/git-show-index.txt
@@ -44,6 +44,8 @@ OPTIONS
 	valid values are 'sha1' and (if enabled) 'sha256'.  The default is the
 	algorithm for the current repository (set by `extensions.objectFormat`), or
 	'sha1' if no value is set or outside a repository..
++
+include::object-format-disclaimer.txt[]
 
 GIT
 ---
diff --git a/git.html b/git.html
index e4c9106ee..2dbe12894 100644
--- a/git.html
+++ b/git.html
@@ -2801,7 +2801,8 @@ double-quotes and respecting backslash escapes. E.g., the value
         If this variable is set, the default hash algorithm for new

         repositories will be set to this value. This value is currently

         ignored when cloning; the setting of the remote repository

-        is used instead. The default is "sha1".

+        is used instead. The default is "sha1". THIS VARIABLE IS

+        EXPERIMENTAL! See <code>--object-format</code> in <a href="git-init.html">git-init(1)</a>.

 </p>

 </dd>

 </dl></div>

@@ -3550,7 +3551,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-10 16:30:08 PDT

+ 2020-08-24 15:54:20 PDT

 </div>

 </div>

 </body>

diff --git a/git.txt b/git.txt
index 81349a84e..2fc92586b 100644
--- a/git.txt
+++ b/git.txt
@@ -504,7 +504,8 @@ double-quotes and respecting backslash escapes. E.g., the value
 	If this variable is set, the default hash algorithm for new
 	repositories will be set to this value. This value is currently
 	ignored when cloning; the setting of the remote repository
-	is used instead. The default is "sha1".
+	is used instead. The default is "sha1". THIS VARIABLE IS
+	EXPERIMENTAL! See `--object-format` in linkgit:git-init[1].
 
 Git Commits
 ~~~~~~~~~~~
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index ba8d6ab40..386c652ed 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

- 2020-08-19 16:40:59 PDT

+ 2020-08-24 15:55:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index b6a907ec4..826019429 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

- 2020-08-19 16:41:00 PDT

+ 2020-08-24 15:55:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 6bea99429..212a1d53e 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

- 2020-08-19 16:40:42 PDT

+ 2020-08-24 15:55:08 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 8383b7007..ead94a04b 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

- 2020-08-19 16:40:59 PDT

+ 2020-08-24 15:55:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 993c1130c..a9f5bf3a2 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

- 2020-08-19 16:40:58 PDT

+ 2020-08-24 15:55:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 63ccaf283..58e08bf61 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

- 2020-08-19 16:40:55 PDT

+ 2020-08-24 15:55:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 011802220..4447a11ec 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

- 2020-08-19 16:40:56 PDT

+ 2020-08-24 15:55:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index f02e1c844..ac52657f4 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

- 2020-08-19 16:40:53 PDT

+ 2020-08-24 15:55:11 PDT

 </div>

 </div>

 </body>

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

- 2020-08-19 16:40:43 PDT

+ 2020-08-24 15:55:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 38803ed7b..cbe5e7e48 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

- 2020-08-19 16:40:52 PDT

+ 2020-08-24 15:55:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 216e3b2d1..ed2d24824 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

- 2020-08-19 16:40:50 PDT

+ 2020-08-24 15:55:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 897f20a6b..556735a54 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

- 2020-08-19 16:40:49 PDT

+ 2020-08-24 15:55:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index dec1e37a2..854733094 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

- 2020-08-19 16:40:47 PDT

+ 2020-08-24 15:55:10 PDT

 </div>

 </div>

 </body>

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

- 2020-08-19 16:40:44 PDT

+ 2020-08-24 15:55:09 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 c2feb4eb9..f7d797285 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

- 2020-08-19 16:40:46 PDT

+ 2020-08-24 15:55:09 PDT

 </div>

 </div>

 </body>

diff --git a/object-format-disclaimer.txt b/object-format-disclaimer.txt
new file mode 100644
index 000000000..4cb106f0d
--- /dev/null
+++ b/object-format-disclaimer.txt
@@ -0,0 +1,6 @@
+THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still
+in an early stage.  A SHA-256 repository will in general not be able to
+share work with "regular" SHA-1 repositories.  It should be assumed
+that, e.g., Git internal file formats in relation to SHA-256
+repositories may change in backwards-incompatible ways.  Only use
+`--object-format=sha256` for testing purposes.