The thirteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 1, 2024 at 13:21 UTC
c2cbfbd2e28cbe27c194d62183b42f27a6a5bb87
1 file changed
+26
Documentation/RelNotes/2.45.0.txt
+26
@@ -57,6 +57,9 @@ UI, Workflows & Features
57
* Remove an ancient and not well maintained Hg-to-git migration
58
script from contrib/.
59
60
+ * Hints that suggest what to do after resolving conflicts can now be
61
+ squelched by disabling advice.mergeConflict.
62
+
63
64
Performance, Internal Implementation, Development Support etc.
65
@@ -111,6 +114,10 @@ Performance, Internal Implementation, Development Support etc.
114
* A new fuzz target that exercises config parsing code has been
115
added.
116
117
+ * Fix the way recently added tests interpolate variables defined
118
+ outside them, and document the best practice to help future
119
+ developers.
120
+
121
122
Fixes since v2.44
123
-----------------
@@ -244,6 +251,25 @@ Fixes since v2.44
251
updated.
252
(merge bff85a338c bl/doc-key-val-sep-fix later to maint).
253
254
+ * "git checkout --conflict=bad" reported a bad conflictStyle as if it
255
+ were given to a configuration variable; it has been corrected to
256
+ report that the command line option is bad.
257
+ (merge 5a99c1ac1a pw/checkout-conflict-errorfix later to maint).
258
+
259
+ * Code clean-up in the "git log" machinery that implements custom log
260
+ message formatting.
261
+ (merge 1c10b8e5b0 jk/pretty-subject-cleanup later to maint).
262
+
263
+ * "git config" corrupted literal HT characters written in the
264
+ configuration file as part of a value, which has been corrected.
265
+ (merge e6895c3f97 ds/config-internal-whitespace-fix later to maint).
266
+
267
+ * A unit test for reftable code tried to enumerate all files in a
268
+ directory after reftable operations and expected to see nothing but
269
+ the files it wanted to leave there, but was fooled by .nfs* cruft
270
+ files left, which has been corrected.
271
+ (merge 0068aa7946 ps/reftable-unit-test-nfs-workaround later to maint).
272
+
273
* Other code cleanup, docfix, build fix, etc.
274
(merge f0e578c69c rs/use-xstrncmpz later to maint).
275
(merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).