From d788c94190a9a0d5d68472bedaba79e275f753b8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Aug 2022 10:46:11 -0700 Subject: Autogenerated HTML docs for v2.37.2-296-g5502f --- RelNotes/2.37.2.txt | 24 ++++++++++++++++++++++++ RelNotes/2.38.0.txt | 11 ----------- 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 +- 18 files changed, 40 insertions(+), 27 deletions(-) diff --git a/RelNotes/2.37.2.txt b/RelNotes/2.37.2.txt index 300fb095c..d82b29e01 100644 --- a/RelNotes/2.37.2.txt +++ b/RelNotes/2.37.2.txt @@ -61,4 +61,28 @@ Fixes since v2.37.1 * Workaround for a false positive compiler warning. + * The resolve-undo information in the index was not protected against + GC, which has been corrected. + + * A corner case bug where lazily fetching objects from a promisor + remote resulted in infinite recursion has been corrected. + + * "git p4" working on UTF-16 files on Windows did not implement + CRLF-to-LF conversion correctly, which has been corrected. + + * "git p4" did not handle non-ASCII client name well, which has been + corrected. + + * "rerere-train" script (in contrib/) used to honor commit.gpgSign + while recreating the throw-away merges. + + * "git checkout" miscounted the paths it updated, which has been + corrected. + + * Fix for a bug that makes write-tree to fail to write out a + non-existent index as a tree, introduced in 2.37. + + * There was a bug in the codepath to upgrade generation information + in commit-graph from v1 to v2 format, which has been corrected. + Also contains minor documentation updates and code clean-ups. diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt index c3de8e2cd..9a435dc7c 100644 --- a/RelNotes/2.38.0.txt +++ b/RelNotes/2.38.0.txt @@ -151,11 +151,9 @@ Fixes since v2.37 * The resolve-undo information in the index was not protected against GC, which has been corrected. - (merge e0ad13977a jc/resolve-undo later to maint). * A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected. - (merge cb88b37cb9 hx/lookup-commit-in-graph-fix later to maint). * "git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which @@ -186,27 +184,21 @@ Fixes since v2.37 * "git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. - (merge 4d35f74421 mb/p4-utf16-crlf later to maint). * "git p4" did not handle non-ASCII client name well, which has been corrected. - (merge d205483695 kk/p4-client-name-encoding-fix later to maint). * "rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. - (merge cc391fc886 cl/rerere-train-with-no-sign later to maint). * "git checkout" miscounted the paths it updated, which has been corrected. - (merge 611c7785e8 mt/checkout-count-fix later to maint). * Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. - (merge 4447d4129d tk/untracked-cache-with-uall later to maint). * There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. - (merge 9550f6c16a tb/commit-graph-genv2-upgrade-fix later to maint). * Gitweb had legacy URL shortener that is specific to the way projects hosted on kernel.org used to (but no longer) work, which @@ -234,6 +226,3 @@ Fixes since v2.37 (merge 1250dff32b js/ort-clean-up-after-failed-merge later to maint). * Other code cleanup, docfix, build fix, etc. - (merge a700395eaf ma/t4200-update later to maint). - (merge ce5f07983d mt/pkt-line-comment-tweak later to maint). - (merge 1e11fab59c jc/string-list-cleanup later to maint). diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index ae76b4b94..680269a3c 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 ae4c0cc85..a8047313e 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 e9db7a5b0..742713d40 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 b854237e6..b1e36bff7 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 0bbf6b20f..bcf4559fa 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 80f7b0328..b225a3b4e 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 a71a02944..39e459ae9 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 e7e3bd131..72de85608 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 292aeff9f..66ebb388f 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 1bbc4af30..4db021f9c 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 c183b13b7..6dfb68f60 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 9f0ebdf11..b08d15e51 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 0a619fea8..8288caeca 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 e5df44709..98db2957e 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 868ca00de..8fbd2806b 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 20346896c..4dab70dda 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.

-- cgit 1.2.3-korg