From 5948fb6eafc5e8f810c9c4c0056f881d2f2c63b0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 11 Oct 2022 11:09:30 -0700 Subject: Autogenerated HTML docs for v2.38.0-83-gd420d --- RelNotes/2.39.0.txt | 16 ++++++++++++++++ git-config.html | 2 +- git-mergetool.html | 2 +- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- technical/bundle-uri.html | 12 ++++++------ technical/bundle-uri.txt | 8 ++++---- 21 files changed, 44 insertions(+), 28 deletions(-) diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt index a26c82444..a6ee7c899 100644 --- a/RelNotes/2.39.0.txt +++ b/RelNotes/2.39.0.txt @@ -66,9 +66,25 @@ Fixes since v2.38 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). + * 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). diff --git a/git-config.html b/git-config.html index c9f5c855f..541b82775 100644 --- a/git-config.html +++ b/git-config.html @@ -8503,7 +8503,7 @@ mergetool.hideResolved possible and write the MERGED file containing conflict markers around any conflicts that it cannot resolve; LOCAL and REMOTE normally represent the versions of the file from before Git’s conflict - resolution. This flag causes LOCAL and REMOTE to be overwriten so + resolution. This flag causes LOCAL and REMOTE to be overwritten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the mergetool.<tool>.hideResolved configuration variable. Defaults to false. diff --git a/git-mergetool.html b/git-mergetool.html index f640addad..dc6726b54 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -988,7 +988,7 @@ mergetool.hideResolved possible and write the MERGED file containing conflict markers around any conflicts that it cannot resolve; LOCAL and REMOTE normally represent the versions of the file from before Git’s conflict - resolution. This flag causes LOCAL and REMOTE to be overwriten so + resolution. This flag causes LOCAL and REMOTE to be overwritten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the mergetool.<tool>.hideResolved configuration variable. Defaults to false. diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 0a183adbd..48de33e69 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 177292fe9..0e8d7db56 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 1401d2d97..61ee5f47e 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index e05e08963..842daa718 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 64f5cf4af..1f4a7bbf6 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 1f8f2b613..266b14209 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 diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index ff815c4b3..5e4f2b23d 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 3b2363f23..122f45f8e 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) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 81c4f03ae..84383b02d 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 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index c7d7dfba3..aee4e6d15 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 4fc76faaa..d776d0c52 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index ff1c4a18d..ffe2c0189 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.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 5a831fc09..80bf34ca8 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.

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

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 649fe6a82..8ca3ba198 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 diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 1fc5fe354..8ee55b8ae 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.

diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index f22657a9b..10ee76499 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -942,8 +942,8 @@ bundle.<id>.creationToken

This value is a nonnegative 64-bit integer used for sorting the bundles - the list. This is used to download a subset of bundles during a fetch - when bundle.heuristic=creationToken. + list. This is used to download a subset of bundles during a fetch when + bundle.heuristic=creationToken.

@@ -1052,10 +1052,10 @@ If the downloaded data from a bundle URI is a bundle, then the client making those OIDs present. When all required OIDs are present, the client unbundles that data using a refspec. The default refspec is +refs/heads/*:refs/bundles/*, but this can be configured. These refs - are stored so that later git fetch negotiations can communicate the - bundled refs as have`s, reducing the size of the fetch over the Git + are stored so that later git fetch negotiations can communicate each + bundled ref as a have, reducing the size of the fetch over the Git protocol. To allow pruning refs from this ref namespace, Git may - introduce a numbered namespace (such as `refs/bundles/<i>/*) such that + introduce a numbered namespace (such as refs/bundles/<i>/*) such that stale bundle refs can be deleted.

@@ -1463,7 +1463,7 @@ would cause these on-demand downloads to be too aggressive.

diff --git a/technical/bundle-uri.txt b/technical/bundle-uri.txt index 18f2dedd4..b78d01d9a 100644 --- a/technical/bundle-uri.txt +++ b/technical/bundle-uri.txt @@ -153,8 +153,8 @@ bundle..filter:: bundle..creationToken:: This value is a nonnegative 64-bit integer used for sorting the bundles - the list. This is used to download a subset of bundles during a fetch - when `bundle.heuristic=creationToken`. + list. This is used to download a subset of bundles during a fetch when + `bundle.heuristic=creationToken`. bundle..location:: This string value advertises a real-world location from where the bundle @@ -234,8 +234,8 @@ will interact with bundle URIs according to the following flow: making those OIDs present. When all required OIDs are present, the client unbundles that data using a refspec. The default refspec is `+refs/heads/*:refs/bundles/*`, but this can be configured. These refs - are stored so that later `git fetch` negotiations can communicate the - bundled refs as `have`s, reducing the size of the fetch over the Git + are stored so that later `git fetch` negotiations can communicate each + bundled ref as a `have`, reducing the size of the fetch over the Git protocol. To allow pruning refs from this ref namespace, Git may introduce a numbered namespace (such as `refs/bundles//*`) such that stale bundle refs can be deleted. -- cgit 1.2.3-korg