From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2024 21:11:28 +0000 (-0700)
Subject: The sixth batch
X-Git-Tag: v2.45.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=945115026aa63df4ab849ab14a04da31623abece;p=thirdparty%2Fgit.git

The sixth batch

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

diff --git a/Documentation/RelNotes/2.45.0.txt b/Documentation/RelNotes/2.45.0.txt
index c0f9b9e444..2e75932539 100644
--- a/Documentation/RelNotes/2.45.0.txt
+++ b/Documentation/RelNotes/2.45.0.txt
@@ -127,6 +127,9 @@ Fixes since v2.44
    not advertise the capability, which has been corrected.
    (merge a922bfa3b5 jk/upload-pack-v2-capability-cleanup later to maint).
 
+ * Make sure failure return from merge_bases_many() is properly caught.
+   (merge 25fd20eb44 js/merge-base-with-missing-commit later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f0e578c69c rs/use-xstrncmpz later to maint).
    (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).
@@ -142,3 +145,4 @@ Fixes since v2.44
    (merge 9a97b43e03 rs/submodule-prefix-simplify later to maint).
    (merge 40b8076462 ak/rebase-autosquash later to maint).
    (merge 3223204456 eg/add-uflags later to maint).
+   (merge 5f78d52dce es/config-doc-sort-sections later to maint).