The sixth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 29, 2023 at 15:57 UTC
9748a6820043d5815bee770ffa51647e0adc2cf0
1 file changed
+9
Documentation/RelNotes/2.42.0.txt
+9
@@ -31,6 +31,10 @@ Performance, Internal Implementation, Development Support etc.
31
32
* "git worktree" learned to work better with sparse index feature.
33
34
+ * When the external merge driver is killed by a signal, its output
35
+ should not be trusted as a resolution with conflicts that is
36
+ proposed by the driver, but the code did.
37
+
38
39
Fixes since v2.41
40
-----------------
@@ -117,6 +121,11 @@ Fixes since v2.41
121
between the way the code enumerates packfiles in the repository.
122
(merge 73320e49ad tb/collect-pack-filenames-fix later to maint).
123
124
+ * We create .pack and then .idx, we consider only packfiles that have
125
+ .idx usable (those with only .pack are not ready yet), so we should
126
+ remove .idx before removing .pack for consistency.
127
+ (merge 0dd1324a73 ds/remove-idx-before-pack later to maint).
128
+
129
* Other code cleanup, docfix, build fix, etc.
130
(merge 51f9d2e563 sa/doc-ls-remote later to maint).
131
(merge c6d26a9dda jk/format-patch-message-id-unleak later to maint).