Skip to content

Merge Git for Windows v2.56.0(4) #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Johannes Schindelin (dscho) merged 7 commits into from
Oct 26, 2026
+25 −14
Merged

Merge Git for Windows v2.56.0(4) #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4089c7
fixup! README.md: Add a Windows-specific preamble
dscho Oct 9, 2026
afecfd9
fixup! README.md: Add a Windows-specific preamble
dscho Oct 9, 2026
992304c
ci: switch away from unsupported i386/ubuntu image
pks-t Oct 15, 2026
fdfbfa9
ci: work around Debian 12's HTTP/2 authentication failures
dscho Oct 25, 2026
9327972
install-dependencies: work around a permission problem
dscho Oct 25, 2026
5812916
ci: pin linux32 to ubuntu-24.04 to restore networking
dscho Oct 25, 2026
c91b11b
Merge tag 'v2.56.0.windows.4' into merge-v2.56.0.windows.4
dscho Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,8 @@ jobs:
cc: gcc
- jobname: linux-musl-meson
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:20.04
image: i386/debian:latest
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
Expand All @@ -453,7 +452,9 @@ jobs:
CC: ${{matrix.vector.cc}}
CI_JOB_IMAGE: ${{matrix.vector.image}}
CUSTOM_PATH: /custom
runs-on: ubuntu-latest
runs-on: >-
${{ matrix.vector.jobname == 'linux32'
&& 'ubuntu-24.04' || 'ubuntu-latest' }}
container:
image: ${{ matrix.vector.image }}
options: ${{ github.repository_visibility == 'private' && '--pids-limit 16384 --ulimit nproc=16384:16384 --ulimit nofile=32768:32768' || '' }}
Expand Down
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ test:linux:
CC: gcc
- jobname: linux-musl-meson
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:20.04
image: i386/debian:latest
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
Expand Down
8 changes: 2 additions & 6 deletions ci/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fedora-*|almalinux-*)
dnf -yq update >/dev/null &&
dnf -yq install shadow-utils sudo make pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel $MESON_DEPS cargo >/dev/null
;;
ubuntu-*|i386/ubuntu-*|debian-*)
ubuntu-*|i386/debian-*|debian-*)
# Required so that apt doesn't wait for user input on certain packages.
export DEBIAN_FRONTEND=noninteractive

Expand All @@ -48,10 +48,6 @@ ubuntu-*|i386/ubuntu-*|debian-*)
SVN='libsvn-perl subversion'
LANGUAGES='language-pack-is'
;;
i386/ubuntu-*)
SVN=
LANGUAGES='language-pack-is'
;;
*)
SVN='libsvn-perl subversion'
LANGUAGES='locales-all'
Expand Down Expand Up @@ -84,7 +80,7 @@ ubuntu-*|i386/ubuntu-*|debian-*)
# See <https://github.com/uutils/coreutils/issues/10508>.
if test -x /usr/bin/gnudirname
then
ln -sfT /usr/bin/gnudirname /usr/bin/dirname
sudo ln -sfT /usr/bin/gnudirname /usr/bin/dirname
fi

case "$distro" in
Expand Down
2 changes: 1 addition & 1 deletion ci/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ then
CI_OS_NAME=osx
JOBS=$(nproc)
;;
*,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*)
*,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/debian:*)
CI_OS_NAME=linux
JOBS=$(nproc)
;;
Expand Down
19 changes: 17 additions & 2 deletions t/t5551-http-fetch-smart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ fi
test "$HTTP_PROTO" = "HTTP/2" && enable_http2
start_httpd

# The cURL version which Debian 12 ships (v7.88.1) can fail to retry
# authentication after an early HTTP/2 response. This bug was introduced
# in cURL v7.88.0 (8c762f5998 (http2: minor buffer and error path fixes,
# 2023-02-08)) and fixed in v8.3.0 (https://github.com/curl/curl/pull/11756).
test_lazy_prereq HAVE_CURL_HTTP2_BUG '
test_have_prereq HTTP2 &&
build_option libcurl |
awk -F. '\''
($1 == 7 && $2 >= 88) || ($1 == 8 && $2 < 3) { broken = 1 }
END { exit !broken }
'\''
'

test_expect_success HTTP2 'enable client-side http/2' '
git config --global http.version HTTP/2
'
Expand Down Expand Up @@ -224,7 +237,8 @@ test_expect_success 'clone from auth-only-for-push repository' '
test_cmp expect actual
'

test_expect_success 'clone from auth-only-for-objects repository' '
test_expect_success !HAVE_CURL_HTTP2_BUG \
'clone from auth-only-for-objects repository' '
echo two >expect &&
set_askpass user@host pass@host &&
git clone --bare "$HTTPD_URL/auth-fetch/smart/repo.git" half-auth &&
Expand All @@ -233,7 +247,8 @@ test_expect_success 'clone from auth-only-for-objects repository' '
test_cmp expect actual
'

test_expect_success 'no-op half-auth fetch does not require a password' '
test_expect_success !HAVE_CURL_HTTP2_BUG \
'no-op half-auth fetch does not require a password' '
set_askpass wrong &&

# NEEDSWORK: When using HTTP(S), protocol v0 supports a "half-auth"
Expand Down
Loading