Skip to content

Commit 602f6c3

Browse files
committed
Sync with Git 2.55
2 parents 2bf33c6 + e9019fc commit 602f6c3

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

Documentation/RelNotes/2.55.0.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ UI, Workflows & Features
3131
subcommand "git url-parse".
3232

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

3638
* Document the fact that .git/info/exclude is shared across worktrees
3739
linked to the same repository.

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
DEF_VER=v2.55.0-rc2
3+
DEF_VER=v2.55.0
44

55
LF='
66
'

t/lib-httpd/apache.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ DocumentRoot www
44
LogFormat "%h %l %u %t \"%r\" %>s %b" common
55
CustomLog access.log common
66
ErrorLog error.log
7+
Timeout 600
78
<IfModule !mod_log_config.c>
89
LoadModule log_config_module modules/mod_log_config.so
910
</IfModule>

t/t5551-http-fetch-smart.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,16 @@ create_tags () {
397397
}
398398

399399
test_expect_success 'create 2,000 tags in the repo' '
400+
git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
400401
(
401-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
402+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
402403
create_tags 1 2000
403404
)
404405
'
405406

406407
test_expect_success CMDLINE_LIMIT \
407408
'clone the 2,000 tag repo to check OS command line overflow' '
408-
run_with_limited_cmdline git clone $HTTPD_URL/smart/repo.git too-many-refs &&
409+
run_with_limited_cmdline git clone $HTTPD_URL/smart/many-tags.git too-many-refs &&
409410
(
410411
cd too-many-refs &&
411412
git for-each-ref refs/tags >actual &&
@@ -483,12 +484,12 @@ test_expect_success 'test allowanysha1inwant with unreachable' '
483484
test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
484485
test_when_finished "rm -f tags" &&
485486
(
486-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
487+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
487488
create_tags 2001 50000
488489
) &&
489490
git -C too-many-refs fetch -q --tags &&
490491
(
491-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
492+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
492493
create_tags 50001 100000
493494
) &&
494495
git -C too-many-refs fetch -q --tags &&

0 commit comments

Comments
 (0)