Skip to content

Commit

Permalink
Sync with 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Oct 23, 2023
2 parents 8dfa3ed + 2e8e77c commit ea05f20
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions Documentation/RelNotes/2.43.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
-----------------
Expand Down Expand Up @@ -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).
Expand Down

0 comments on commit ea05f20

Please sign in to comment.