The 16th batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.53.0.adoc b/Documentation/RelNotes/2.53.0.adoc
index 9e8384a4c101ac2f7e0912509bf24a68f132c174..32b6966c9e4dc4733b7fd2a52d273d05ac5a8bc4 100644 (file)
--- a/Documentation/RelNotes/2.53.0.adoc
+++ b/Documentation/RelNotes/2.53.0.adoc
@@ -228,6 +228,16 @@ Fixes since v2.52
    handling stateful ISO/IEC 2022 encoded strings.
    (merge cee341e9dd rs/macos-iconv-workaround later to maint).
 
+ * Running "git diff" with "--name-only" and other options that allows
+   us not to look at the blob contents, while objects that are lazily
+   fetched from a promisor remote, caused use-after-free, which has
+   been corrected.
+
+ * The ort merge machinery hit an assertion failure in a history with
+   criss-cross merges renamed a directory and a non-directory, which
+   has been corrected.
+   (merge 979ee83e8a en/ort-recursive-d-f-conflict-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 46207a54cc qj/doc-http-bad-want-response later to maint).
    (merge df90eccd93 kh/doc-commit-extra-references later to maint).
@@ -252,3 +262,4 @@ Fixes since v2.52
    (merge 93f894c001 bc/checkout-error-message-fix later to maint).
    (merge abf05d856f rs/show-branch-prio-queue later to maint).
    (merge 06188ea5f3 rs/parse-config-expiry-simplify later to maint).
+   (merge 861dbb1586 dd/t5403-modernise later to maint).