Skip to content

Commit 6de20f6

Browse files
committed
The 4th batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c679abf commit 6de20f6

1 file changed

Lines changed: 30 additions & 0 deletions

File tree

‎Documentation/RelNotes/2.98.0.adoc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,23 @@ Performance, Internal Implementation, Development Support etc.
6969
when deciding to run unit tests on Windows, mirroring the behaviour in
7070
the modern GitHub and GitLab workflows.
7171
72+
* The Windows GitLab CI job has been updated to provision and use the
73+
GCC-targeting Rust toolchain for MinGW builds, fixing job failures
74+
caused by incomplete Rust setup and missing linker support.
75+
(merge 1e5f522ef1 js/gitlab-ci-windows-rust later to maint).
76+
77+
* The external merge driver in 'git merge' now uses the tempfile API
78+
to create its temporary files. This ensures that these temporaries
79+
are reliably cleaned up even when the merge driver or its parent Git
80+
process is terminated abruptly.
81+
82+
* The performance test for `git fetch` pack-dir rescans has been
83+
updated to use the `--no-deref` option when cleaning up
84+
remote-tracking branches. This prevents `git update-ref` from
85+
failing with a multiple updates error when both a symref and its
86+
target are deleted in the same transaction.
87+
88+
7289
7390
Fixes since v2.56
7491
-----------------
@@ -140,3 +157,16 @@ Fixes since v2.56
140157
object IDs instead of SHA-1, to more accurately reflect that the
141158
active hash algorithm is used.
142159
(merge b2ab8fccc3 jk/name-rev-update-hash-descriptions later to maint).
160+
161+
* The HTTP transport has been updated to handle changes in recent curl
162+
versions that strip credentials from the effective URL, preventing
163+
unnecessary credential prompts during redirects.
164+
(merge 76524c2604 jk/http-curl-strip-creds later to maint).
165+
166+
* The timestamp used for checking the reflog of a remote-tracking
167+
branch during 'git push --force-if-includes' was left uninitialized
168+
when the reflog was completely empty, which has been corrected.
169+
(merge c84ed3a0ab as/push-force-if-includes-no-reflog later to maint).
170+
171+
* Other code cleanup, docfix, build fix, etc.
172+
(merge e638de60bc kz/doc-add-rm-typofix later to maint).

0 commit comments

Comments
 (0)