Autogenerated HTML docs for v2.38.1-175-gdb29e

23 files changed, 89 insertions, 47 deletions

diff --git a/RelNotes/2.38.2.txt b/RelNotes/2.38.2.txt
new file mode 100644
index 000000000..00d4b7765
--- /dev/null
+++ b/RelNotes/2.38.2.txt
@@ -0,0 +1,47 @@
+Git 2.38.2 Release Notes
+========================
+
+This is to backport various fixes accumulated during the development
+towards Git 2.39, the next feature release.
+
+
+Fixes since v2.38.1
+-------------------
+
+ * Update CodingGuidelines to clarify what features to use and avoid
+   in C99.
+
+ * The codepath that reads from the index v4 had unaligned memory
+   accesses, which has been corrected.
+
+ * "git remote rename" failed to rename a remote without fetch
+   refspec, which has been corrected.
+
+ * "git clone" did not like to see the "--bare" and the "--origin"
+   options used together without a good reason.
+
+ * Fix messages incorrectly marked for translation.
+
+ * "git fsck" failed to release contents of tree objects already used
+   from the memory, which has been fixed.
+
+ * "git rebase -i" can mistakenly attempt to apply a fixup to a commit
+   itself, which has been corrected.
+
+ * In read-only repositories, "git merge-tree" tried to come up with a
+   merge result tree object, which it failed (which is not wrong) and
+   led to a segfault (which is bad), which has been corrected.
+
+ * Force C locale while running tests around httpd to make sure we can
+   find expected error messages in the log.
+
+ * Fix a logic in "mailinfo -b" that miscomputed the length of a
+   substring, which lead to an out-of-bounds access.
+
+ * The codepath to sign learned to report errors when it fails to read
+   from "ssh-keygen".
+
+ * "GIT_EDITOR=: git branch --edit-description" resulted in failure,
+   which has been corrected.
+
+Also contains various documentation updates and code clean-ups.
diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt
index 815366182..782bc0eda 100644
--- a/RelNotes/2.39.0.txt
+++ b/RelNotes/2.39.0.txt
@@ -45,33 +45,29 @@ Performance, Internal Implementation, Development Support etc.
 
  * Update CodingGuidelines to clarify what features to use and avoid
    in C99.
-   (merge 438c2f859b ab/coding-guidelines-c99 later to maint).
 
  * Avoid false-positive from LSan whose assumption may be broken with
    higher optimization levels.
 
+ * Enable address and undefined sanitizer tasks at GitHub Actions CI.
+
 
 Fixes since v2.38
 -----------------
 
  * The codepath that reads from the index v4 had unaligned memory
    accesses, which has been corrected.
-   (merge 4a6ed30f96 vd/fix-unaligned-read-index-v4 later to maint).
 
  * Fix messages incorrectly marked for translation.
-   (merge 02cb8b9ee3 ah/fsmonitor-daemon-usage-non-l10n later to maint).
 
  * "git fsck" failed to release contents of tree objects already used
    from the memory, which has been fixed.
-   (merge 51b27747e5 jk/fsck-on-diet later to maint).
 
  * "git clone" did not like to see the "--bare" and the "--origin"
    options used together without a good reason.
-   (merge 3b910d6e29 jk/clone-allow-bare-and-o-together later to maint).
 
  * "git remote rename" failed to rename a remote without fetch
    refspec, which has been corrected.
-   (merge 5a97b38109 jk/remote-rename-without-fetch-refspec later to maint).
 
  * Documentation on various Boolean GIT_* environment variables have
    been clarified.
@@ -79,7 +75,6 @@ Fixes since v2.38
 
  * "git rebase -i" can mistakenly attempt to apply a fixup to a commit
    itself, which has been corrected.
-   (merge 3e367a5f2f ja/rebase-i-avoid-amending-self later to maint).
 
  * "git multi-pack-index repack/expire" used to repack unreachable
    cruft into a new pack, which have been corrected.
@@ -88,26 +83,20 @@ Fixes since v2.38
  * In read-only repositories, "git merge-tree" tried to come up with a
    merge result tree object, which it failed (which is not wrong) and
    led to a segfault (which is bad), which has been corrected.
-   (merge 92481d1b26 js/merge-ort-in-read-only-repo later to maint).
 
  * Force C locale while running tests around httpd to make sure we can
    find expected error messages in the log.
-   (merge 7a2d8ea47e rs/test-httpd-in-C-locale later to maint).
 
  * Fix a logic in "mailinfo -b" that miscomputed the length of a
    substring, which lead to an out-of-bounds access.
-   (merge 3ef1494685 pw/mailinfo-b-fix later to maint).
 
  * The codepath to sign learned to report errors when it fails to read
    from "ssh-keygen".
-   (merge 36fb0d07d8 pw/ssh-sign-report-errors later to maint).
 
  * Code clean-up that results in plugging a leak.
-   (merge 246526d019 rs/bisect-start-leakfix later to maint).
 
  * "GIT_EDITOR=: git branch --edit-description" resulted in failure,
    which has been corrected.
-   (merge e288b3de35 jc/branch-description-unset later to maint).
 
  * The code to clean temporary object directories (used for
    quarantine) tried to remove them inside its signal handler, which
@@ -135,17 +124,23 @@ Fixes since v2.38
    corrected.
    (merge db84376f98 ab/grep-simplify-extended-expression later to maint).
 
+ * "git diff rev^!" did not show combined diff to go to the rev from
+   its parents.
+   (merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
+
+ * Allow configuration files in "protected" scopes to include other
+   configuration files.
+   (merge ecec57b3c9 gc/bare-repo-discovery later to maint).
+
+ * Give a bit more diversity to macOS CI by using sha1dc in one of the
+   jobs (the other one tests Apple Common Crypto).
+   (merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge c34a6bd291 so/diff-merges-cleanup later to maint).
-   (merge 5e7c8b75e7 ab/test-malloc-with-sanitize-leak later to maint).
    (merge 2a905f8fa8 ah/branch-autosetupmerge-grammofix later to maint).
    (merge abcac2e19f rj/ref-filter-get-head-description-leakfix later to maint).
    (merge 71e5473493 hn/parse-worktree-ref later to maint).
-   (merge 7190b7ebf9 ds/bundle-uri-docfix later to maint).
-   (merge 45350aeb11 jk/sequencer-missing-author-name-check later to maint).
-   (merge edbf9a2e20 nb/doc-mergetool-typofix later to maint).
-   (merge b004c90282 rs/gc-pack-refs-simplify later to maint).
-   (merge 69c5f17f11 jk/cleanup-callback-parameters later to maint).
    (merge 7c07f36ad2 ab/unused-annotation later to maint).
    (merge f7669676d0 rs/use-fspathncmp later to maint).
    (merge a677d3c416 pw/remove-rebase-p-test later to maint).
diff --git a/git-diff.html b/git-diff.html
index 9081a4d2f..9a8fe99b5 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -843,10 +843,10 @@ of &lt;commit&gt; and HEAD.  <code>git diff --merge-base A</code> is equivalent
 <p>

         This form is to view the results of a merge commit.  The first

         listed &lt;commit&gt; must be the merge itself; the remaining two or

-        more commits should be its parents.  A convenient way to produce

-        the desired set of revisions is to use the <code>^@</code> suffix.

-        For instance, if <code>master</code> names a merge commit, <code>git diff master

-        master^@</code> gives the same combined diff as <code>git show master</code>.

+        more commits should be its parents.  Convenient ways to produce

+        the desired set of revisions are to use the suffixes <code>^@</code> and

+        <code>^!</code>.  If A is a merge commit, then <code>git diff A A^@</code>,

+        <code>git diff A^!</code> and <code>git show A</code> all give the same combined diff.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3646,7 +3646,7 @@ diff.colorMovedWS
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-14 13:23:11 PDT

+ 2022-10-26 11:43:43 PDT

 </div>

 </div>

 </body>

diff --git a/git-diff.txt b/git-diff.txt
index 85ae6d6d0..52b679256 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -79,10 +79,10 @@ If --merge-base is given, use the merge base of the two commits for the
 
 	This form is to view the results of a merge commit.  The first
 	listed <commit> must be the merge itself; the remaining two or
-	more commits should be its parents.  A convenient way to produce
-	the desired set of revisions is to use the `^@` suffix.
-	For instance, if `master` names a merge commit, `git diff master
-	master^@` gives the same combined diff as `git show master`.
+	more commits should be its parents.  Convenient ways to produce
+	the desired set of revisions are to use the suffixes `^@` and
+	`^!`.  If A is a merge commit, then `git diff A A^@`,
+	`git diff A^!` and `git show A` all give the same combined diff.
 
 'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
 
diff --git a/git-rev-parse.html b/git-rev-parse.html
index d5529c0c4..300106a39 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1814,7 +1814,7 @@ three notations also consider its parents. For example you can say
 <dd>

 <p>

   A suffix <em>&#94;</em> followed by an exclamation mark is the same

-  as giving commit <em>&lt;rev&gt;</em> and then all its parents prefixed with

+  as giving commit <em>&lt;rev&gt;</em> and all its parents prefixed with

   <em>&#94;</em> to exclude them (and their ancestors).

 </p>

 </dd>

diff --git a/gitrevisions.html b/gitrevisions.html
index 56c5a7ff7..ff806000d 100644
--- a/gitrevisions.html
+++ b/gitrevisions.html
@@ -1281,7 +1281,7 @@ three notations also consider its parents. For example you can say
 <dd>

 <p>

   A suffix <em>&#94;</em> followed by an exclamation mark is the same

-  as giving commit <em>&lt;rev&gt;</em> and then all its parents prefixed with

+  as giving commit <em>&lt;rev&gt;</em> and all its parents prefixed with

   <em>&#94;</em> to exclude them (and their ancestors).

 </p>

 </dd>

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 81164400f..32758c2c8 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:18 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index ecdb5530a..78207b154 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:18 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 3faaa34a7..dae01d821 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:18 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 22f4acf79..825e76c52 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

- 2022-10-21 13:46:44 PDT

+ 2022-10-26 11:44:16 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index be161fccc..16d3c90b3 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:18 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 45d567d06..d4de8cb7f 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:18 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 54707545f..dd0ce0c64 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

- 2022-10-21 13:46:45 PDT

+ 2022-10-26 11:44:17 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 10699bb60..e07674613 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

- 2022-10-21 13:46:46 PDT

+ 2022-10-26 11:44:17 PDT

 </div>

 </div>

 </body>

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

- 2022-10-21 13:46:45 PDT

+ 2022-10-26 11:44:17 PDT

 </div>

 </div>

 </body>

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

- 2022-10-21 13:46:44 PDT

+ 2022-10-26 11:44:16 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 62fd52cb9..9f2981f9f 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

- 2022-10-21 13:46:45 PDT

+ 2022-10-26 11:44:17 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 8b6b480d5..1e51caaab 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

- 2022-10-21 13:46:45 PDT

+ 2022-10-26 11:44:17 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 613240ece..cef171c2f 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

- 2022-10-21 13:46:45 PDT

+ 2022-10-26 11:44:16 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 29d51cf7d..883e79d25 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

- 2022-10-21 13:46:44 PDT

+ 2022-10-26 11:44:16 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 83d213e34..180fa888e 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

- 2022-10-21 13:46:44 PDT

+ 2022-10-26 11:44:16 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 e70a70590..daa6e66b1 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

- 2022-10-21 13:46:44 PDT

+ 2022-10-26 11:44:16 PDT

 </div>

 </div>

 </body>

diff --git a/revisions.txt b/revisions.txt
index e3e350126..0d2e55d78 100644
--- a/revisions.txt
+++ b/revisions.txt
@@ -363,7 +363,7 @@ Revision Range Summary
 
 '<rev>{caret}!', e.g. 'HEAD{caret}!'::
   A suffix '{caret}' followed by an exclamation mark is the same
-  as giving commit '<rev>' and then all its parents prefixed with
+  as giving commit '<rev>' and all its parents prefixed with
   '{caret}' to exclude them (and their ancestors).
 
 '<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'::