From 7a403c3ee5519770b2630b49a59eba7815c8c210 Mon Sep 17 00:00:00 2001 From: "D. Ben Knoble" Date: Wed, 5 Aug 2026 08:19:32 -0400 Subject: [PATCH 1/2] mailmap: change primary address for D. Ben Knoble Ben uses the +github GMail trick to identify emails sent to him by folks that found his GitHub profile. At the time, that also meant he had to commit under the same email for GitHub to recognize his commits. He has since found out that GitHub can be configured with more than one email for identification, and he would prefer his canonical email to omit mention of GitHub (where it's not relevant) going forward. Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index d518b388fe..48c34797b9 100644 --- a/.mailmap +++ b/.mailmap @@ -45,6 +45,7 @@ Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +D. Ben Knoble Dan Johnson Dana L. How Dana L. How Dana How From 2c78326f810173a4f3aefd8021f1e07575412481 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 5 Aug 2026 11:10:39 -0700 Subject: [PATCH 2/2] The 11th batch Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.56.0.adoc | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Documentation/RelNotes/2.56.0.adoc b/Documentation/RelNotes/2.56.0.adoc index a57ca5426f..87ac9067f1 100644 --- a/Documentation/RelNotes/2.56.0.adoc +++ b/Documentation/RelNotes/2.56.0.adoc @@ -76,6 +76,9 @@ UI, Workflows & Features filtered on the client based on server-advertised capabilities, returning empty strings for inapplicable or unsupported fields. + * 'git branch -d' has been taught to report when a branch cannot be + deleted because it is being used in an active bisect run. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -280,6 +283,21 @@ Performance, Internal Implementation, Development Support etc. first refactoring force_object_loose() to use generic ODB write interfaces instead of loose-backend internals. + * Object database housekeeping in 'git gc' and 'git maintenance' has + been refactored to be pluggable. The files-backend-specific logic, + including incremental and geometric repacking as well as object + pruning, has been moved out of the command implementation and into the + files object database source, enabling future alternative object + database backends to implement their own housekeeping services. + + * The image version used by the static-analysis CI job has been bumped + to ubuntu-latest (Ubuntu 24.04), which brings in a newer Coccinelle + version that resolves a severe performance regression. A false + positive warning from the 'CHECK_ASSERTION_SIDE_EFFECTS' build with + GCC 15 in the Bloom filter code has also been silenced to facilitate + the image upgrade. + (merge 1a1579c42d jk/ci-static-analysis-image-bump later to maint). + Fixes since v2.55 ----------------- @@ -466,3 +484,26 @@ Fixes since v2.55 * The remote-matching logic for submodules has been corrected to resolve 'url.*.insteadOf' aliases before comparing the inventoried URL from '.gitmodules' with the URLs of configured remotes. + + * 'git diff --relative' running with '--cached' has been corrected to + avoid a segfault when encountering unmerged paths outside the + prefix. + (merge 447126ed7d jk/diff-relative-cached-unmerged later to maint). + + * Two bugs in how 'git rebase' handles skipped 'fixup' and 'squash' + commands have been fixed. One bug caused an incorrect commit count to + be shown in the template message when multiple commands were skipped, + and another prevented the editor from opening when the final command + in a chain containing 'fixup -c' was skipped. + + * The alias tests in 't/t0014-alias.sh' have been updated to dynamically + query the list of deprecated commands using 'git + --list-cmds=deprecated' to avoid test failures when running with + 'WITH_BREAKING_CHANGES' in a build directory that contains stale + executables of formerly deprecated commands. + (merge bc57ecb915 jk/t0014-dynamic-deprecated-cmds later to maint). + + * Git for Windows has been updated to avoid auto-detecting the symlink + type if the target path starts with a slash, preventing NTLM + credential leaks when checking out repositories with crafted + symbolic links pointing to network shares.