The 12th batch

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

diff --git a/Documentation/RelNotes/2.54.0.adoc b/Documentation/RelNotes/2.54.0.adoc
index f37c0be602db3364db4b676a54dbde3dc9ff8e98..fa6e42f3bb100a35c44753962a0eda0511862d1c 100644 (file)
--- a/Documentation/RelNotes/2.54.0.adoc
+++ b/Documentation/RelNotes/2.54.0.adoc
@@ -136,9 +136,13 @@ Performance, Internal Implementation, Development Support etc.
 
  * Clean-up the code around "git repo info" command.
 
- * Mark the marge-ort codebase to prevent more uses of the_repository
+ * Mark the merge-ort codebase to prevent more uses of the_repository
    from getting added.
 
+ * The core.attributesfile is intended to be set per repository, but
+   were kept track of by a single global variable in-core, which has
+   been corrected by moving it to per-repository data structure.
+
 
 Fixes since v2.53
 -----------------
@@ -225,6 +229,11 @@ Fixes since v2.53
    corrected.
    (merge 3ef68ff40e sp/shallow-deepen-relative-fix later to maint).
 
+ * "fsck" iterates over packfiles and its access to pack data caused
+   the list to be permuted, which caused it to loop forever; the code
+   to access pack data by "fsck" has been updated to avoid this.
+   (merge 13eb65d366 ps/fsck-stream-from-the-right-object-instance later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
    (merge 7a747f972d dd/t5403-modernise later to maint).