Autogenerated HTML docs for v2.43.0-232-ge7955

git · Dec 27, 2023 · 7ae46b4 · 7ae46b4
1 parent 8c556f8
commit 7ae46b4
Show file tree

Hide file tree

Showing 63 changed files with 155 additions and 92 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">2023-12-20</span>
+<span id="revdate">2023-12-27</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">2023-12-20</span>
+<span id="revdate">2023-12-27</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt
@@ -1,6 +1,13 @@
 Git v2.44 Release Notes
 =======================
 
+Backward Compatibility Notes
+
+ * "git chekcout -B <branch>" used to allow switching to a branch that
+   is in use on another worktree, but this was by mistake.  The users
+   need to use "--ignore-other-worktrees" option.
+
+
 UI, Workflows & Features
 
  * "git add" and "git stash" learned to support the ":(attr:...)"
@@ -19,6 +26,14 @@ UI, Workflows & Features
    arguments to the "add/set" subcommands of "git sparse-checkout"
    better.
 
+ * "git checkout -B <branch> [<start-point>]" allowed a branch that is
+   in use in another worktree to be updated and checked out, which
+   might be a bit unexpected.  The rule has been tightened, which is a
+   breaking change.  "--ignore-other-worktrees" option is required to
+   unbreak you, if you are used to the current behaviour that "-B"
+   overrides the safety.
+   (merge b23285a921 jc/checkout-B-branch-in-use later to maint).
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -36,6 +51,19 @@ Performance, Internal Implementation, Development Support etc.
 
  * Subject approxidate() and show_date() machinery to OSS-Fuzz.
 
+ * A new helper to let us pretend that we called lstat() when we know
+   our cache_entry is up-to-date via fsmonitor.
+
+ * The optimization based on fsmonitor in the "diff --cached"
+   codepath is resurrected with the "fake-lstat" introduced earlier.
+
+ * Test balloon to use C99 "bool" type from <stdbool.h> has been
+   added.
+
+ * "git clone" has been prepared to allow cloning a repository with
+   non-default hash function into a repository that uses the reftable
+   backend.
+
 
 Fixes since v2.43
 -----------------
@@ -94,6 +122,18 @@ Fixes since v2.43
    specified with valueless "true", which has been corrected.
    (merge d49cb162fa jk/implicit-true later to maint).
 
+ * Code clean-up for sanity checking of command line options for "git
+   show-ref".
+   (merge 7382497372 rs/show-ref-incompatible-options later to maint).
+
+ * The code to parse the From e-mail header has been updated to avoid
+   recursion.
+   (merge dee182941f jk/mailinfo-iterative-unquote-comment later to maint).
+
+ * "git fetch --atomic" issued an unnecessary empty error message,
+   which has been corrected.
+   (merge 18ce48918c jx/fetch-atomic-error-message-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 50f1abcff6 js/packfile-h-typofix later to maint).
    (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint).
@@ -103,3 +143,11 @@ Fixes since v2.43
    (merge e4299d26d4 mk/doc-gitfile-more later to maint).
    (merge 792b86283b rs/incompatible-options-messages later to maint).
    (merge ea8f9494ab jk/config-cleanup later to maint).
+   (merge d1bd3a8c34 jk/mailinfo-oob-read-fix later to maint).
+   (merge c0cadb0576 ps/reftable-fixes later to maint).
+   (merge 647b5e0998 ps/chainlint-self-check-update later to maint).
+   (merge 68fcebfb1a es/add-doc-list-short-form-of-all-in-synopsis later to maint).
+   (merge bc62d27d5c jc/doc-most-refs-are-not-that-special later to maint).
+   (merge 6d6f1cd7ee jc/doc-misspelt-refs-fix later to maint).
+   (merge 37e8d795be sp/test-i18ngrep later to maint).
+   (merge fbc6526ea6 rs/t6300-compressed-size-fix 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">2023-12-20</span>
+<span id="revdate">2023-12-27</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">2023-12-20</span>
+<span id="revdate">2023-12-27</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">2023-12-20</span>
+<span id="revdate">2023-12-27</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">2023-12-20</span>
+<span id="revdate">2023-12-27</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-add.html b/git-add.html
@@ -750,7 +750,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
 <pre class="content"><em>git add</em> [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
-          [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
+          [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
           [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
           [--chmod=(+|-)x] [--pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]]
           [--] [&lt;pathspec&gt;&#8230;]</pre>
@@ -1425,7 +1425,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-02-22 15:29:29 PST
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-add.txt b/git-add.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
-	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
+	  [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
 	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
 	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	  [--] [<pathspec>...]

diff --git a/git-bisect.html b/git-bisect.html
@@ -1063,7 +1063,7 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <div class="paragraph"><p>Do not checkout the new working tree at each iteration of the bisection
-process. Instead just update a special reference named <code>BISECT_HEAD</code> to make
+process. Instead just update the reference named <code>BISECT_HEAD</code> to make
 it point to the commit that should be tested.</p></div>
 <div class="paragraph"><p>This option may be useful when the test you would perform in each step
 does not require a checked out tree.</p></div>
@@ -1244,7 +1244,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-30 23:29:48 PDT
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-bisect.txt b/git-bisect.txt
@@ -362,7 +362,7 @@ OPTIONS
 --no-checkout::
 +
 Do not checkout the new working tree at each iteration of the bisection
-process. Instead just update a special reference named `BISECT_HEAD` to make
+process. Instead just update the reference named `BISECT_HEAD` to make
 it point to the commit that should be tested.
 +
 This option may be useful when the test you would perform in each step

diff --git a/git-checkout.html b/git-checkout.html
@@ -813,7 +813,9 @@ <h2 id="_description">DESCRIPTION</h2>
 $ git checkout &lt;branch&gt;</code></pre>
 </div></div>
 <div class="paragraph"><p>that is to say, the branch is not reset/created unless "git checkout" is
-successful.</p></div>
+successful (e.g., when the branch is in use in another worktree, not
+just the current branch stays the same, but the branch is not reset to
+the start-point, either).</p></div>
 </dd>
 <dt class="hdlist1">
 <em>git checkout</em> --detach [&lt;branch&gt;]
@@ -1633,7 +1635,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-checkout.txt b/git-checkout.txt
@@ -63,7 +63,9 @@ $ git checkout <branch>
 ------------
 +
 that is to say, the branch is not reset/created unless "git checkout" is
-successful.
+successful (e.g., when the branch is in use in another worktree, not
+just the current branch stays the same, but the branch is not reset to
+the start-point, either).
 
 'git checkout' --detach [<branch>]::
 'git checkout' [--detach] <commit>::

diff --git a/git-config.html b/git-config.html
@@ -5928,7 +5928,7 @@ <h3 id="_variables">Variables</h3>
         <code>--notes=&lt;ref&gt;</code>, where <code>ref</code> is the non-boolean value. Defaults
         to false.
 </p>
-<div class="paragraph"><p>If one wishes to use the ref <code>ref/notes/true</code>, please use that literal
+<div class="paragraph"><p>If one wishes to use the ref <code>refs/notes/true</code>, please use that literal
 instead.</p></div>
 <div class="paragraph"><p>This configuration can be specified multiple times in order to allow
 multiple notes refs to be included. In that case, it will behave

diff --git a/git-diff.html b/git-diff.html
@@ -877,7 +877,7 @@ <h2 id="_description">DESCRIPTION</h2>
 noted that all of the &lt;commit&gt; in the above description, except
 in the <code>--merge-base</code> case and in the last two forms that use <code>..</code>
 notations, can be any &lt;tree&gt;. A tree of interest is the one pointed to
-by the special ref <code>AUTO_MERGE</code>, which is written by the <em>ort</em> merge
+by the ref named <code>AUTO_MERGE</code>, which is written by the <em>ort</em> merge
 strategy upon hitting merge conflicts (see <a href="git-merge.html">git-merge(1)</a>).
 Comparing the working tree with <code>AUTO_MERGE</code> shows changes you&#8217;ve made
 so far to resolve textual conflicts (see the examples below).</p></div>
@@ -3679,7 +3679,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-diff.txt b/git-diff.txt
@@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be
 noted that all of the <commit> in the above description, except
 in the `--merge-base` case and in the last two forms that use `..`
 notations, can be any <tree>. A tree of interest is the one pointed to
-by the special ref `AUTO_MERGE`, which is written by the 'ort' merge
+by the ref named `AUTO_MERGE`, which is written by the 'ort' merge
 strategy upon hitting merge conflicts (see linkgit:git-merge[1]).
 Comparing the working tree with `AUTO_MERGE` shows changes you've made
 so far to resolve textual conflicts (see the examples below).

diff --git a/git-merge.html b/git-merge.html
@@ -1089,7 +1089,7 @@ <h2 id="_options">OPTIONS</h2>
 <dd>
 <p>
         Automatically create a temporary stash entry before the operation
-        begins, record it in the special ref <code>MERGE_AUTOSTASH</code>
+        begins, record it in the ref <code>MERGE_AUTOSTASH</code>
         and apply it after the operation ends.  This means
         that you can run the operation on a dirty worktree.  However, use
         with care: the final stash application after a successful
@@ -1307,7 +1307,7 @@ <h2 id="_true_merge">TRUE MERGE</h2>
 </li>
 <li>
 <p>
-A special ref <code>AUTO_MERGE</code> is written, pointing to a tree
+A ref named <code>AUTO_MERGE</code> is written, pointing to a tree
    corresponding to the current content of the working tree (including
    conflict markers for textual conflicts).  Note that this ref is only
    written when the <em>ort</em> merge strategy is used (the default).
@@ -2336,7 +2336,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-merge.txt b/git-merge.txt
@@ -196,7 +196,7 @@ happens:
    can inspect the stages with `git ls-files -u`).  The working
    tree files contain the result of the merge operation; i.e. 3-way
    merge results with familiar conflict markers `<<<` `===` `>>>`.
-5. A special ref `AUTO_MERGE` is written, pointing to a tree
+5. A ref named `AUTO_MERGE` is written, pointing to a tree
    corresponding to the current content of the working tree (including
    conflict markers for textual conflicts).  Note that this ref is only
    written when the 'ort' merge strategy is used (the default).

diff --git a/git-pull.html b/git-pull.html
@@ -1110,7 +1110,7 @@ <h3 id="_options_related_to_merging">Options related to merging</h3>
 <dd>
 <p>
         Automatically create a temporary stash entry before the operation
-        begins, record it in the special ref <code>MERGE_AUTOSTASH</code>
+        begins, record it in the ref <code>MERGE_AUTOSTASH</code>
         and apply it after the operation ends.  This means
         that you can run the operation on a dirty worktree.  However, use
         with care: the final stash application after a successful

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">2023-12-20</span>
+<span id="revdate">2023-12-27</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-switch.html b/git-switch.html
@@ -823,14 +823,18 @@ <h2 id="_options">OPTIONS</h2>
 <dd>
 <p>
         Create a new branch named <code>&lt;new-branch&gt;</code> starting at
-        <code>&lt;start-point&gt;</code> before switching to the branch. This is a
-        convenient shortcut for:
+        <code>&lt;start-point&gt;</code> before switching to the branch. This is the
+        transactional equivalent of
 </p>
 <div class="listingblock">
 <div class="content">
 <pre><code>$ git branch &lt;new-branch&gt;
 $ git switch &lt;new-branch&gt;</code></pre>
 </div></div>
+<div class="paragraph"><p>that is to say, the branch is not reset/created unless "git switch" is
+successful (e.g., when the branch is in use in another worktree, not
+just the current branch stays the same, but the branch is not reset to
+the start-point, either).</p></div>
 </dd>
 <dt class="hdlist1">
 -C &lt;new-branch&gt;
@@ -1199,7 +1203,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git-switch.txt b/git-switch.txt
@@ -59,13 +59,18 @@ out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 -c <new-branch>::
 --create <new-branch>::
 	Create a new branch named `<new-branch>` starting at
-	`<start-point>` before switching to the branch. This is a
-	convenient shortcut for:
+	`<start-point>` before switching to the branch. This is the
+	transactional equivalent of
 +
 ------------
 $ git branch <new-branch>
 $ git switch <new-branch>
 ------------
++
+that is to say, the branch is not reset/created unless "git switch" is
+successful (e.g., when the branch is in use in another worktree, not
+just the current branch stays the same, but the branch is not reset to
+the start-point, either).
 
 -C <new-branch>::
 --force-create <new-branch>::

diff --git a/git.html b/git.html
@@ -3755,10 +3755,11 @@ <h2 id="_discussion_a_id_discussion_a">Discussion<a id="Discussion"></a></h2>
 <div class="paragraph"><p>When first created, objects are stored in individual files, but for
 efficiency may later be compressed together into "pack files".</p></div>
 <div class="paragraph"><p>Named pointers called refs mark interesting points in history.  A ref
-may contain the SHA-1 name of an object or the name of another ref.  Refs
-with names beginning <code>ref/head/</code> contain the SHA-1 name of the most
+may contain the SHA-1 name of an object or the name of another ref (the
+latter is called a "symbolic ref").
+Refs with names beginning <code>refs/head/</code> contain the SHA-1 name of the most
 recent commit (or "head") of a branch under development.  SHA-1 names of
-tags of interest are stored under <code>ref/tags/</code>.  A special ref named
+tags of interest are stored under <code>refs/tags/</code>.  A symbolic ref named
 <code>HEAD</code> contains the name of the currently checked-out branch.</p></div>
 <div class="paragraph"><p>The index file is initialized with a list of all paths and, for each
 path, a blob object and a set of attributes.  The blob object represents
@@ -3836,7 +3837,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-18 14:49:41 PST
+ 2023-12-27 15:50:18 PST
 </div>
 </div>
 </body>

diff --git a/git.txt b/git.txt
@@ -1025,10 +1025,11 @@ When first created, objects are stored in individual files, but for
 efficiency may later be compressed together into "pack files".
 
 Named pointers called refs mark interesting points in history.  A ref
-may contain the SHA-1 name of an object or the name of another ref.  Refs
-with names beginning `ref/head/` contain the SHA-1 name of the most
+may contain the SHA-1 name of an object or the name of another ref (the
+latter is called a "symbolic ref").
+Refs with names beginning `refs/head/` contain the SHA-1 name of the most
 recent commit (or "head") of a branch under development.  SHA-1 names of
-tags of interest are stored under `ref/tags/`.  A special ref named
+tags of interest are stored under `refs/tags/`.  A symbolic ref named
 `HEAD` contains the name of the currently checked-out branch.
 
 The index file is initialized with a list of all paths and, for each