From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 11 Mar 2023 20:18:15 +0000 (+0100)
Subject: Sync with 2.35.8
X-Git-Tag: v2.36.6~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62298def14e7f17cdc1c70464de87fff50670bf5;p=thirdparty%2Fgit.git

Sync with 2.35.8

* maint-2.35: (29 commits)
  Git 2.35.8
  Git 2.34.8
  Git 2.33.8
  Git 2.32.7
  Git 2.31.8
  tests: avoid using `test_i18ncmp`
  Git 2.30.9
  gettext: avoid using gettext if the locale dir is not present
  apply --reject: overwrite existing `.rej` symlink if it exists
  http.c: clear the 'finished' member once we are done with it
  clone.c: avoid "exceeds maximum object size" error with GCC v12.x
  range-diff: use ssize_t for parsed "len" in read_patches()
  range-diff: handle unterminated lines in read_patches()
  range-diff: drop useless "offset" variable from read_patches()
  t5604: GETTEXT_POISON fix, conclusion
  t5604: GETTEXT_POISON fix, part 1
  t5619: GETTEXT_POISON fix
  t0003: GETTEXT_POISON fix, conclusion
  t0003: GETTEXT_POISON fix, part 1
  t0033: GETTEXT_POISON fix
  http: support CURLOPT_PROTOCOLS_STR
  ...
---

62298def14e7f17cdc1c70464de87fff50670bf5
diff --cc ci/install-dependencies.sh
index 107757a1fe,df6c61713c..a1a7b34eb9
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -12,10 -12,10 +12,10 @@@ UBUNTU_COMMON_PKGS="make libssl-dev lib
   libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
  
  case "$runs_on_pool" in
- ubuntu-latest)
+ ubuntu-*)
  	sudo apt-get -q update
  	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
- 		$UBUNTU_COMMON_PKGS $CC_PACKAGE
 -		$UBUNTU_COMMON_PKGS $PYTHON_PACKAGE
++		$UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE
  	mkdir --parents "$P4_PATH"
  	pushd "$P4_PATH"
  		wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@@ -80,16 -80,14 +80,14 @@@ linux-gcc-default
  	;;
  esac
  
 -if type p4d >/dev/null && type p4 >/dev/null
 +if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
  then
  	echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
- 	p4d -V | grep Rev.
+ 	p4d -V
  	echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
- 	p4 -V | grep Rev.
- else
- 	echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
+ 	p4 -V
  fi
 -if type git-lfs >/dev/null
 +if type git-lfs >/dev/null 2>&1
  then
  	echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
  	git-lfs version