Autogenerated HTML docs for v2.33.0-664-g0785eb

19 files changed, 77 insertions, 46 deletions

diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt
index a7793987f..7b03e625d 100644
--- a/RelNotes/2.34.0.txt
+++ b/RelNotes/2.34.0.txt
@@ -270,6 +270,36 @@ Fixes since v2.33
  * Correct nr and alloc members of strvec struct to be of type size_t.
    (merge 8d133a4653 jk/strvec-typefix later to maint).
 
+ * "git stash", where the tentative change involves changing a
+   directory to a file (or vice versa), was confused, which has been
+   corrected.
+   (merge bee8691f19 en/stash-df-fix later to maint).
+
+ * "git clone" from a repository whose HEAD is unborn into a bare
+   repository didn't follow the branch name the other side used, which
+   is corrected.
+   (merge 6b58df54cf jk/clone-unborn-head-in-bare later to maint).
+
+ * "git cvsserver" had a long-standing bug in its authentication code,
+   which has finally been corrected (it is unclear and is a separate
+   question if anybody is seriously using it, though).
+   (merge 4b81f690f6 cb/cvsserver later to maint).
+
+ * "git difftool --dir-diff" mishandled symbolic links.
+   (merge 5bafb3576a da/difftool-dir-diff-symlink-fix later to maint).
+
+ * Sensitive data in the HTTP trace were supposed to be redacted, but
+   we failed to do so in HTTP/2 requests.
+   (merge b66c77a64e jk/http-redact-fix later to maint).
+
+ * "make clean" has been updated to remove leftover .depend/
+   directories, even when it is not told to use them to compute header
+   dependencies.
+   (merge f0a74bcb03 ab/make-clean-depend-dirs later to maint).
+
+ * Protocol v0 clients can get stuck parsing a malformed feature line.
+   (merge 44d2aec6e8 ah/connect-parse-feature-v0-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 1d9c8daef8 ab/bundle-doc later to maint).
    (merge 81483fe613 en/merge-strategy-docs later to maint).
@@ -308,3 +338,7 @@ Fixes since v2.33
    (merge ae578de926 po/git-config-doc-mentions-help-c later to maint).
    (merge 187fc8b8b6 cb/unicode-14 later to maint).
    (merge 3584cff71c en/typofixes later to maint).
+   (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
+   (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
+   (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).
+   (merge dd20e4a6db ab/make-compdb-fix later to maint).
diff --git a/git-cvsserver.html b/git-cvsserver.html
index dd1c93789..d662a3203 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -880,7 +880,7 @@ looks like</p></div>
 <div class="content">

 <pre><code>   cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver</code></pre>

 </div></div>

-<div class="paragraph"><p>Only anonymous access is provided by pserve by default. To commit you

+<div class="paragraph"><p>Only anonymous access is provided by pserver by default. To commit you

 will have to create pserver accounts, simply add a gitcvs.authdb

 setting in the config file of the repositories you want the cvsserver

 to allow writes to, for example:</p></div>

@@ -893,21 +893,19 @@ to allow writes to, for example:</p></div>
 for example:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>   myuser:$1Oyx5r9mdGZ2

-   myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./</code></pre>

+<pre><code>   myuser:sqkNi8zPf01HI

+   myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/

+   myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3</code></pre>

 </div></div>

 <div class="paragraph"><p>You can use the <em>htpasswd</em> facility that comes with Apache to make these

-files, but Apache&#8217;s MD5 crypt method differs from the one used by most C

-library&#8217;s crypt() function, so don&#8217;t use the -m option.</p></div>

-<div class="paragraph"><p>Alternatively you can produce the password with perl&#8217;s crypt() operator:</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>   perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password</code></pre>

-</div></div>

+files, but only with the -d option (or -B if your system suports it).</p></div>

+<div class="paragraph"><p>Preferably use the system specific utility that manages password hash

+creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or

+pwhash in NetBSD) and paste it in the right location.</p></div>

 <div class="paragraph"><p>Then provide your password via the pserver method, for example:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>   cvs -d:pserver:someuser:somepassword &lt;at&gt; server/path/repo.git co &lt;HEAD_name&gt;</code></pre>

+<pre><code>   cvs -d:pserver:someuser:somepassword@server:/path/repo.git co &lt;HEAD_name&gt;</code></pre>

 </div></div>

 <div class="paragraph"><p>No special setup is needed for SSH access, other than having Git tools

 in the PATH. If you have clients that do not accept the CVS_SERVER

@@ -916,7 +914,7 @@ environment variable, you can rename <em>git-cvsserver</em> to <code>cvs</code>.
 CVS_SERVER directly in CVSROOT like</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co &lt;HEAD_name&gt;</code></pre>

+<pre><code>   cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co &lt;HEAD_name&gt;</code></pre>

 </div></div>

 <div class="paragraph"><p>This has the advantage that it will be saved in your <em>CVS/Root</em> files and

 you don&#8217;t need to worry about always setting the correct environment

@@ -971,8 +969,8 @@ If you didn&#8217;t specify the CVSROOT/CVS_SERVER directly in the checkout comm
 <div class="content">

 <div class="listingblock">

 <div class="content">

-<pre><code>     export CVSROOT=:ext:user@server:/var/git/project.git

-     export CVS_SERVER="git cvsserver"</code></pre>

+<pre><code>   export CVSROOT=:ext:user@server:/var/git/project.git

+   export CVS_SERVER="git cvsserver"</code></pre>

 </div></div>

 </div></div>

 </li>

@@ -995,7 +993,7 @@ Clients should now be able to check out the project. Use the CVS <em>module</em>
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code>     cvs co -d project-master master</code></pre>

+<pre><code>   cvs co -d project-master master</code></pre>

 </div></div>

 </li>

 </ol></div>

@@ -1313,7 +1311,7 @@ and <code>gitcvs.allBinary</code> to "guess".</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-06 21:22:01 PDT

+ 2021-10-04 12:51:07 PDT

 </div>

 </div>

 </body>

diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index f2e4a47eb..4dc57ed25 100644
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -99,7 +99,7 @@ looks like
 
 ------
 
-Only anonymous access is provided by pserve by default. To commit you
+Only anonymous access is provided by pserver by default. To commit you
 will have to create pserver accounts, simply add a gitcvs.authdb
 setting in the config file of the repositories you want the cvsserver
 to allow writes to, for example:
@@ -114,21 +114,20 @@ The format of these files is username followed by the encrypted password,
 for example:
 
 ------
-   myuser:$1Oyx5r9mdGZ2
-   myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
+   myuser:sqkNi8zPf01HI
+   myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/
+   myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3
 ------
 You can use the 'htpasswd' facility that comes with Apache to make these
-files, but Apache's MD5 crypt method differs from the one used by most C
-library's crypt() function, so don't use the -m option.
+files, but only with the -d option (or -B if your system suports it).
 
-Alternatively you can produce the password with perl's crypt() operator:
------
-   perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password
------
+Preferably use the system specific utility that manages password hash
+creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or
+pwhash in NetBSD) and paste it in the right location.
 
 Then provide your password via the pserver method, for example:
 ------
-   cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
+   cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>
 ------
 No special setup is needed for SSH access, other than having Git tools
 in the PATH. If you have clients that do not accept the CVS_SERVER
@@ -138,7 +137,7 @@ Note: Newer CVS versions (>= 1.12.11) also support specifying
 CVS_SERVER directly in CVSROOT like
 
 ------
-cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
+   cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
 ------
 This has the advantage that it will be saved in your 'CVS/Root' files and
 you don't need to worry about always setting the correct environment
@@ -186,8 +185,8 @@ allowing access over SSH.
 +
 --
 ------
-     export CVSROOT=:ext:user@server:/var/git/project.git
-     export CVS_SERVER="git cvsserver"
+   export CVSROOT=:ext:user@server:/var/git/project.git
+   export CVS_SERVER="git cvsserver"
 ------
 --
 4. For SSH clients that will make commits, make sure their server-side
@@ -203,7 +202,7 @@ allowing access over SSH.
    `project-master` directory:
 +
 ------
-     cvs co -d project-master master
+   cvs co -d project-master master
 ------
 
 [[dbbackend]]
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 82a44fc1c..6d3ea9bbe 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-09-28 14:12:46 PDT

+ 2021-10-04 12:51:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 3b0000a5a..a5e64c2e6 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index ff0d4c3c9..290c5ae6f 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 7493621b9..445f6efbb 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-09-28 14:12:43 PDT

+ 2021-10-04 12:51:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index af750aa97..8d08067fb 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 6df25d361..c453159f8 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:46 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index c03e47efc..33ff18802 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 458eeead3..b688be04e 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-09-28 14:12:45 PDT

+ 2021-10-04 12:51:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 7afa56591..db0045885 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-09-28 14:12:44 PDT

+ 2021-10-04 12:51:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index c71d4fa87..f4b5a4c61 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-09-28 14:12:43 PDT

+ 2021-10-04 12:51:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 7c42a124c..de936e4c7 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-09-28 14:12:44 PDT

+ 2021-10-04 12:51:45 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7d60d0100..3f7dc6543 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-09-28 14:12:44 PDT

+ 2021-10-04 12:51:44 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 1a231fe9c..3161ab53b 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-09-28 14:12:44 PDT

+ 2021-10-04 12:51:44 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 10319996b..38c8764f5 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-09-28 14:12:44 PDT

+ 2021-10-04 12:51:44 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 6402aa668..9ad6ba554 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-09-28 14:12:43 PDT

+ 2021-10-04 12:51:44 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 828592003..bbeea3e4d 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-09-28 14:12:43 PDT

+ 2021-10-04 12:51:44 PDT

 </div>

 </div>

 </body>