Skip to content

Commit 5502f77

Browse files
committed
Sync with Git 2.37.2
2 parents c50926e + ad60ddd commit 5502f77

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

Documentation/RelNotes/2.37.2.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,28 @@ Fixes since v2.37.1
6161

6262
* Workaround for a false positive compiler warning.
6363

64+
* The resolve-undo information in the index was not protected against
65+
GC, which has been corrected.
66+
67+
* A corner case bug where lazily fetching objects from a promisor
68+
remote resulted in infinite recursion has been corrected.
69+
70+
* "git p4" working on UTF-16 files on Windows did not implement
71+
CRLF-to-LF conversion correctly, which has been corrected.
72+
73+
* "git p4" did not handle non-ASCII client name well, which has been
74+
corrected.
75+
76+
* "rerere-train" script (in contrib/) used to honor commit.gpgSign
77+
while recreating the throw-away merges.
78+
79+
* "git checkout" miscounted the paths it updated, which has been
80+
corrected.
81+
82+
* Fix for a bug that makes write-tree to fail to write out a
83+
non-existent index as a tree, introduced in 2.37.
84+
85+
* There was a bug in the codepath to upgrade generation information
86+
in commit-graph from v1 to v2 format, which has been corrected.
87+
6488
Also contains minor documentation updates and code clean-ups.

Documentation/RelNotes/2.38.0.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,9 @@ Fixes since v2.37
151151

152152
* The resolve-undo information in the index was not protected against
153153
GC, which has been corrected.
154-
(merge e0ad13977a jc/resolve-undo later to maint).
155154

156155
* A corner case bug where lazily fetching objects from a promisor
157156
remote resulted in infinite recursion has been corrected.
158-
(merge cb88b37cb9 hx/lookup-commit-in-graph-fix later to maint).
159157

160158
* "git clone" from a repository with some ref whose HEAD is unborn
161159
did not set the HEAD in the resulting repository correctly, which
@@ -186,27 +184,21 @@ Fixes since v2.37
186184

187185
* "git p4" working on UTF-16 files on Windows did not implement
188186
CRLF-to-LF conversion correctly, which has been corrected.
189-
(merge 4d35f74421 mb/p4-utf16-crlf later to maint).
190187

191188
* "git p4" did not handle non-ASCII client name well, which has been
192189
corrected.
193-
(merge d205483695 kk/p4-client-name-encoding-fix later to maint).
194190

195191
* "rerere-train" script (in contrib/) used to honor commit.gpgSign
196192
while recreating the throw-away merges.
197-
(merge cc391fc886 cl/rerere-train-with-no-sign later to maint).
198193

199194
* "git checkout" miscounted the paths it updated, which has been
200195
corrected.
201-
(merge 611c7785e8 mt/checkout-count-fix later to maint).
202196

203197
* Fix for a bug that makes write-tree to fail to write out a
204198
non-existent index as a tree, introduced in 2.37.
205-
(merge 4447d4129d tk/untracked-cache-with-uall later to maint).
206199

207200
* There was a bug in the codepath to upgrade generation information
208201
in commit-graph from v1 to v2 format, which has been corrected.
209-
(merge 9550f6c16a tb/commit-graph-genv2-upgrade-fix later to maint).
210202

211203
* Gitweb had legacy URL shortener that is specific to the way
212204
projects hosted on kernel.org used to (but no longer) work, which
@@ -234,6 +226,3 @@ Fixes since v2.37
234226
(merge 1250dff32b js/ort-clean-up-after-failed-merge later to maint).
235227

236228
* Other code cleanup, docfix, build fix, etc.
237-
(merge a700395eaf ma/t4200-update later to maint).
238-
(merge ce5f07983d mt/pkt-line-comment-tweak later to maint).
239-
(merge 1e11fab59c jc/string-list-cleanup later to maint).

0 commit comments

Comments
 (0)