summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-06-13 16:43:49 -0700
committerJunio C Hamano <gitster@pobox.com>2022-06-13 16:43:49 -0700
commite37d45876db66f5ab72436a23c4af28aa23e5d91 (patch)
tree679c1d239b8376f8fc0afce44b8de67e795f38d4
parent7d636aa79e0ae64b741f1951ce6dd46787b94174 (diff)
downloadgit-htmldocs-e37d45876db66f5ab72436a23c4af28aa23e5d91.tar.gz
Autogenerated HTML docs for v2.37.0-rc0
-rw-r--r--RelNotes/2.37.0.txt37
-rw-r--r--SubmittingPatches.html2
-rw-r--r--git-bisect-lk2009.html2
-rw-r--r--git-config.html36
-rw-r--r--git-config.txt2
-rw-r--r--git-tools.html2
-rw-r--r--howto-index.html4
-rw-r--r--howto/coordinate-embargoed-releases.html2
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
-rw-r--r--technical/api-index.html2
24 files changed, 94 insertions, 25 deletions
diff --git a/RelNotes/2.37.0.txt b/RelNotes/2.37.0.txt
index 3ceb73fd0..8f1ff3a59 100644
--- a/RelNotes/2.37.0.txt
+++ b/RelNotes/2.37.0.txt
@@ -54,6 +54,9 @@ UI, Workflows & Features
* Update the doctype written in gitweb output to xhtml5.
+ * The "fetch.credentialsInUrl" configuration variable controls what
+ happens when a URL with embedded login credential is used.
+
Performance, Internal Implementation, Development Support etc.
@@ -262,6 +265,38 @@ Fixes since v2.36
parsing.
(merge f1dfbd9ee0 gc/zero-length-branch-config-fix later to maint).
+ * "git -c diff.submodule=log range-diff" did not show anything for
+ submodules that changed in the ranges being compared, and
+ "git -c diff.submodule=diff range-diff" did not work correctly.
+ Fix this by including the "--submodule=short" output
+ unconditionally to be compared.
+
+ * In Git 2.36 we revamped the way how hooks are invoked. One change
+ that is end-user visible is that the output of a hook is no longer
+ directly connected to the standard output of "git" that spawns the
+ hook, which was noticed post release. This is getting corrected.
+ (merge a082345372 ab/hooks-regression-fix later to maint).
+
+ * Updating the graft information invalidates the list of parents of
+ in-core commit objects that used to be in the graft file.
+
+ * "git show-ref --heads" (and "--tags") still iterated over all the
+ refs only to discard refs outside the specified area, which has
+ been corrected.
+ (merge c0c9d35e27 tb/show-ref-optim later to maint).
+
+ * Remove redundant copying (with index v3 and older) or possible
+ over-reading beyond end of mmapped memory (with index v4) has been
+ corrected.
+ (merge 6d858341d2 zh/read-cache-copy-name-entry-fix later to maint).
+
+ * Sample watchman interface hook sometimes failed to produce
+ correctly formatted JSON message, which has been corrected.
+ (merge 134047b500 sn/fsmonitor-missing-clock later to maint).
+
+ * Use-after-free (with another forget-to-free) fix.
+ (merge 323822c72b ab/remote-free-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge e6b2582da3 cm/reftable-0-length-memset later to maint).
(merge 0b75e5bf22 ab/misc-cleanup later to maint).
@@ -283,3 +318,5 @@ Fixes since v2.36
(merge 2acf4cf001 js/ci-gcc-12-fixes later to maint).
(merge 05e280c0a6 jc/http-clear-finished-pointer later to maint).
(merge 8c49d704ef fh/transport-push-leakfix later to maint).
+ (merge 1d232d38bd tl/ls-tree-oid-only later to maint).
+ (merge db7961e6a6 gc/document-config-worktree-scope later to maint).
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index 026175575..0e1ccb1ed 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -1444,7 +1444,7 @@ this problem around.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-05-20 17:49:42 PDT
+ 2022-06-13 16:41:58 PDT
</div>
</div>
</body>
diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html
index 8a0cf1baf..6ade53c8c 100644
--- a/git-bisect-lk2009.html
+++ b/git-bisect-lk2009.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.2" />
+<meta name="generator" content="AsciiDoc 10.1.4" />
<title>Fighting regressions with git bisect</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/git-config.html b/git-config.html
index c1a39a66b..870d3e54e 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1168,7 +1168,7 @@ available files.</p></div>
<p>
Similar to <code>--show-origin</code> in that it augments the output of
all queried config options with the scope of that value
- (local, global, system, command).
+ (worktree, local, global, system, command).
</p>
</dd>
<dt class="hdlist1">
@@ -5435,6 +5435,38 @@ fetch.writeCommitGraph
</p>
</dd>
<dt class="hdlist1">
+fetch.credentialsInUrl
+</dt>
+<dd>
+<p>
+ A URL can contain plaintext credentials in the form
+ <code>&lt;protocol&gt;://&lt;user&gt;:&lt;password&gt;@&lt;domain&gt;/&lt;path&gt;</code>. Using such URLs
+ is not recommended as it exposes the password in multiple ways,
+ including Git storing the URL as plaintext in the repository config.
+ The <code>fetch.credentialsInUrl</code> option provides instruction for how Git
+ should react to seeing such a URL, with these values:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<code>allow</code> (default): Git will proceed with its activity without warning.
+</p>
+</li>
+<li>
+<p>
+<code>warn</code>: Git will write a warning message to <code>stderr</code> when parsing a URL
+ with a plaintext credential.
+</p>
+</li>
+<li>
+<p>
+<code>die</code>: Git will write a failure message to <code>stderr</code> when parsing a URL
+ with a plaintext credential.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
format.attach
</dt>
<dd>
@@ -11123,7 +11155,7 @@ looks like</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-02-25 16:19:34 PST
+ 2022-06-13 16:41:53 PDT
</div>
</div>
</body>
diff --git a/git-config.txt b/git-config.txt
index bdcfd94b6..9376e39ae 100644
--- a/git-config.txt
+++ b/git-config.txt
@@ -248,7 +248,7 @@ Valid `<type>`'s include:
--show-scope::
Similar to `--show-origin` in that it augments the output of
all queried config options with the scope of that value
- (local, global, system, command).
+ (worktree, local, global, system, command).
--get-colorbool <name> [<stdout-is-tty>]::
diff --git a/git-tools.html b/git-tools.html
index 034c993d4..5841f46ec 100644
--- a/git-tools.html
+++ b/git-tools.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.2" />
+<meta name="generator" content="AsciiDoc 10.1.4" />
<title>Git Tools</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
diff --git a/howto-index.html b/howto-index.html
index 95ad49343..c977887db 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.2" />
+<meta name="generator" content="AsciiDoc 10.1.4" />
<title>Git Howto Index</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -894,7 +894,7 @@ later validate it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-04-17 23:38:51 PDT
+ 2022-06-13 16:41:55 PDT
</div>
</div>
</body>
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 2dc32ff7a..b0de7a8ff 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 445bae8b8..735e3034d 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 408450418..6aa7631d0 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index 12f9527e4..8dfd3123e 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-06-10 15:53:34 PDT
+ 2022-06-13 16:41:55 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 43af56344..f12318947 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 0034e862a..c09f559ba 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 52ac7618f..cbcd3fd8a 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 82dd04c47..bdebc49be 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-06-10 15:53:36 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index ad9a68f16..4aeb319eb 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-06-10 15:53:35 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 26c3df7dd..fa781b0e2 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-06-10 15:53:34 PDT
+ 2022-06-13 16:41:56 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index eda42dd7c..bc18df2cc 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-06-10 15:53:35 PDT
+ 2022-06-13 16:41:57 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 5b2aadfe7..b207f51fe 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-06-10 15:53:35 PDT
+ 2022-06-13 16:41:56 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 8b729a3b7..24f2499c8 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-06-10 15:53:35 PDT
+ 2022-06-13 16:41:56 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index edd6bac19..cb7a5ecef 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-06-10 15:53:35 PDT
+ 2022-06-13 16:41:56 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 58eeaf240..9620b0774 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-06-10 15:53:34 PDT
+ 2022-06-13 16:41:56 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 3141ad46b..ff8a30fc8 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-06-10 15:53:34 PDT
+ 2022-06-13 16:41:56 PDT
</div>
</div>
</body>
diff --git a/technical/api-index.html b/technical/api-index.html
index ed42a5e55..7c709d797 100644
--- a/technical/api-index.html
+++ b/technical/api-index.html
@@ -775,7 +775,7 @@ documents them.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-04-17 23:38:58 PDT
+ 2022-06-13 16:42:01 PDT
</div>
</div>
</body>