Skip to content

[pull] master from git:master #228

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
pull merged 6 commits into from
Jun 29, 2026
Merged

[pull] master from git:master #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6c8bae
http: accept https:// proxies again
dscho Jun 27, 2026
dc51aed
t/lib-httpd: bump apache timeout
peff Jun 28, 2026
1274757
Merge branch 'js/http-https-proxy-fix'
gitster Jun 28, 2026
f6ef747
t5551: put many-tags case into its own repo
peff Jun 28, 2026
7fb089f
Merge branch 'jk/t5551-expensive-test-timeouts-fix'
gitster Jun 29, 2026
e9019fc
Git 2.55
gitster Jun 29, 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
4 changes: 3 additions & 1 deletion Documentation/RelNotes/2.55.0.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ UI, Workflows & Features
subcommand "git url-parse".

* Misspelt proxy URL (e.g., httt://...) did not trigger any warning
or failure, which has been corrected.
or failure, which has been corrected. We had a regression in this
update that broke https:// proxies, but that has been caught and
corrected.

* Document the fact that .git/info/exclude is shared across worktrees
linked to the same repository.
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

DEF_VER=v2.55.0-rc2
DEF_VER=v2.55.0

LF='
'
Expand Down
2 changes: 2 additions & 0 deletions http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,8 @@ static int set_curl_proxy_type(CURL *result, const char *protocol)
if (has_proxy_cert_password())
curl_easy_setopt(result, CURLOPT_PROXY_KEYPASSWD,
proxy_cert_auth.password);

return 0;
}

return -1;
Expand Down
1 change: 1 addition & 0 deletions t/lib-httpd/apache.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ DocumentRoot www
LogFormat "%h %l %u %t \"%r\" %>s %b" common
CustomLog access.log common
ErrorLog error.log
Timeout 600
<IfModule !mod_log_config.c>
LoadModule log_config_module modules/mod_log_config.so
</IfModule>
Expand Down
9 changes: 5 additions & 4 deletions t/t5551-http-fetch-smart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,16 @@ create_tags () {
}

test_expect_success 'create 2,000 tags in the repo' '
git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
(
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
create_tags 1 2000
)
'

test_expect_success CMDLINE_LIMIT \
'clone the 2,000 tag repo to check OS command line overflow' '
run_with_limited_cmdline git clone $HTTPD_URL/smart/repo.git too-many-refs &&
run_with_limited_cmdline git clone $HTTPD_URL/smart/many-tags.git too-many-refs &&
(
cd too-many-refs &&
git for-each-ref refs/tags >actual &&
Expand Down Expand Up @@ -483,12 +484,12 @@ test_expect_success 'test allowanysha1inwant with unreachable' '
test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
test_when_finished "rm -f tags" &&
(
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
create_tags 2001 50000
) &&
git -C too-many-refs fetch -q --tags &&
(
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
create_tags 50001 100000
) &&
git -C too-many-refs fetch -q --tags &&
Expand Down