Skip to content

Commit

Permalink
Sync with 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Sep 23, 2024
2 parents 18be138 + 6258f68 commit 9e56e24
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Documentation/RelNotes/2.46.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ It also reverts the "git patch-id" change that went into 2.46.1,
as it seems to have got a regression reported (I haven't verified,
but it is better to keep a known breakage than adding an unintended
regression).

Other than that, a handful of minor bugfixes are included.

* In a few corner cases "git diff --exit-code" failed to report
"changes" (e.g., renamed without any content change), which has
been corrected.

* Cygwin does have /dev/tty support that is needed by things like
single-key input mode.

* The interpret-trailers command failed to recognise the end of the
message when the commit log ends in an incomplete line.
14 changes: 14 additions & 0 deletions Documentation/RelNotes/2.47.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ Performance, Internal Implementation, Development Support etc.

* The error messages from the test script checker have been improved.

* The convention to calling into built-in command implementation has
been updated to pass the repository, if known, together with the
prefix value.


Fixes since v2.46
-----------------
Expand Down Expand Up @@ -267,6 +271,16 @@ Fixes since v2.46
been corrected.
(merge d3edb0bdde jk/git-pm-bare-repo-fix later to maint).

* When a remote-helper dies before Git writes to it, SIGPIPE killed
Git silently. We now explain the situation a bit better to the end
user in our error message.
(merge 6e7fac9bca jk/diag-unexpected-remote-helper-death later to maint).

* A few usability fixes to "git jump" (in contrib/).
(merge 083b82544d jk/jump-quickfix-fixes later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
(merge 4460e052e0 jc/range-diff-lazy-setup later to maint).
(merge 0627c58e7a ak/typofixes later to maint).
(merge 83799f1500 jk/t9001-deflake later to maint).

0 comments on commit 9e56e24

Please sign in to comment.