The twenty-first batch

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

diff --git a/Documentation/RelNotes/2.43.0.txt b/Documentation/RelNotes/2.43.0.txt
index a1a2da191c0d02b3d58a6ea96cf942666bd00649..a3644aba4468ece61ed2f6279126addc93964ba2 100644 (file)
--- a/Documentation/RelNotes/2.43.0.txt
+++ b/Documentation/RelNotes/2.43.0.txt
@@ -92,6 +92,9 @@ UI, Workflows & Features
  * "git merge-tree" learned to take strategy backend specific options
    via the "-X" option, like "git merge" does.
 
+ * "git log" and friends learned "--dd" that is a short-hand for
+   "--diff-merges=first-parent -p".
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -133,6 +136,9 @@ Performance, Internal Implementation, Development Support etc.
    reduce the number of lstat() system calls.
    (merge 2cdb796101 vd/loose-ref-iteration-optimization later to maint).
 
+ * The codepaths that read "chunk" formatted files have been corrected
+   to pay attention to the chunk size and notice broken files.
+
 
 Fixes since v2.42
 -----------------
@@ -261,6 +267,17 @@ Fixes since v2.42
    not auto-initialize the decoration subsystem, which has been
    corrected.
 
+ * Feeding "git stash store" with a random commit that was not created
+   by "git stash create" now errors out.
+   (merge d9b6634589 jc/fail-stash-to-store-non-stash later to maint).
+
+ * The index file has room only for lower 32-bit of the file size in
+   the cached stat information, which means cached stat information
+   will have 0 in its sd_size member for a file whose size is multiple
+   of 4GiB.  This is mistaken for a racily clean path.  Avoid it by
+   storing a bogus sd_size value instead for such files.
+   (merge 5143ac07b1 bc/racy-4gb-files later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
    (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).