The seventeenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 27, 2024 at 09:19 UTC
daed0c68e94967bfbb3f87e15f7c9090dc1aa1e1
1 file changed
+18
Documentation/RelNotes/2.46.0.txt
+18
@@ -181,6 +181,11 @@ Performance, Internal Implementation, Development Support etc.
181
of the reachability bitmap in a repository with too many refs has
182
been added.
183
184
+ * When "git merge" sees that the index cannot be refreshed (e.g. due
185
+ to another process doing the same in the background), it died but
186
+ after writing MERGE_HEAD etc. files, which was useless for the
187
+ purpose to recover from the failure.
188
+
189
190
Fixes since v2.45
191
-----------------
@@ -329,6 +334,18 @@ Fixes since v2.45
334
updated to use the tempfile API to avoid leaving cruft after
335
failing.
336
337
+ * An unused extern declaration for mingw has been removed to prevent
338
+ it from causing build failure.
339
+ (merge 3c295c87c2 js/mingw-remove-unused-extern-decl later to maint).
340
+
341
+ * A helper function shared between two tests had a copy-paste bug,
342
+ which has been corrected.
343
+ (merge 40d817875d jk/t5500-typofix later to maint).
344
+
345
+ * "git fetch-pack -k -k" without passing "--lock-pack" (which we
346
+ never do ourselves) did not work at all, which has been corrected.
347
+ (merge 96a6621d25 jk/fetch-pack-fsck-wo-lock-pack later to maint).
348
+
349
* Other code cleanup, docfix, build fix, etc.
350
(merge a5a4cb7b27 rs/diff-parseopts-cleanup later to maint).
351
(merge 55702c543e fa/p4-error later to maint).
@@ -342,3 +359,4 @@ Fixes since v2.45
359
(merge e83055ecb0 ds/doc-add-interactive-singlekey later to maint).
360
(merge f1160393c1 ds/ahead-behind-fix later to maint).
361
(merge bf6a86236e jc/worktree-git-path later to maint).
362
+ (merge 28dc26dc33 rs/remove-unused-find-header-mem later to maint).