From: Junio C Hamano Date: Sat, 15 Aug 2026 16:20:13 +0000 (-0700) Subject: The 14th batch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18e66859d87fb4b76599f73460b54f0848c76b16;p=thirdparty%2Fgit.git The 14th batch Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/2.56.0.adoc b/Documentation/RelNotes/2.56.0.adoc index 0f8676fe93..c4bf8b3228 100644 --- a/Documentation/RelNotes/2.56.0.adoc +++ b/Documentation/RelNotes/2.56.0.adoc @@ -85,6 +85,11 @@ UI, Workflows & Features syscall fails has also been improved to name both the source and the destination. + * 'git add' has been taught a new '--resolved' option to stage + conflict-resolved paths, while leaving unrelated local changes + unstaged. It scans the unmerged paths for leftover conflict + markers and aborts if any are found. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -334,6 +339,22 @@ Performance, Internal Implementation, Development Support etc. exit codes (0 for success, 1 for non-ancestor, 128 for errors) and to ensure it cannot be combined with '--all'. + * The 'TRACE2_ANCESTRY' prerequisite in the 't0213' test script has been + refined to avoid failures under user-mode emulation by verifying that + the ancestry collector reports the expected process names rather than + the emulator binary name. + + * Concurrent downloads of packfiles via packfile URIs and dumb HTTP are + safer by avoiding concurrent appends to the staging file. Opening in + read-write mode with separate file offsets prevents corruption and + preserves resumability. 'fetch-pack' now tolerates pre-existing + '.keep' files. + + * The 'ssh-agent' tests in 't7528' have been fixed to work when the + user's login shell is csh-like, by explicitly passing '-s' to + 'ssh-agent' to force Bourne shell syntax. + (merge d5dd17756d kl/t7528-ssh-agent-for-csh-users later to maint). + Fixes since v2.55 -----------------