The 12th batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2026-08-07 12:02:39 -07:00
parent 262508d27a
commit 010afd3166

View File

@@ -298,6 +298,22 @@ Performance, Internal Implementation, Development Support etc.
the image upgrade.
(merge 1a1579c42d jk/ci-static-analysis-image-bump later to maint).
* 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).
* The code path that deals with relative paths in the diff-lib has
been cleaned up.
* The get_commit_action() function has been refactored to be a pure
predicate by moving the side-effecting line-level log range folding to
simplify_commit(). This ensures that evaluating a commit's action
before the walk reaches it does not prematurely mutate its tracked
line ranges, making it safer for potential lookahead evaluations.
Fixes since v2.55
-----------------
@@ -496,14 +512,26 @@ Fixes since v2.55
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.
* 'git cat-file --batch-command' that asked for 'contents' without
'type' segfaults, which has been corrected.
(merge 2abc7f0304 jk/cat-file-batch-wo-type-fix later to maint).
* A memory leak in 'git merge' when run without arguments (which
triggers the default-to-upstream path) has been fixed. A test has
been added to cover this case.
(merge 68cce04a02 tc/merge-default-to-upstream-leakfix later to maint).
* A boundary case check in reachability bitmap traversal has been
corrected to properly handle the object at position zero, which was
previously skipped, leading to redundant bitmap loading.
(merge b56b48301e dl/pack-bitmap-position-zero later to maint).
* A crash in the 'sparse-index' collapse code when encountering an
invalidated cache-tree node (due to an intent-to-add path) has been
fixed by avoiding collapsing such subtrees.
(merge eede1e69fe ds/sparse-index-ita-crash later to maint).