From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2020 18:43:04 +0000 (-0800)
Subject: Merge branch 'js/ci-windows-update'
X-Git-Tag: v2.26.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d;p=thirdparty%2Fgit.git

Merge branch 'js/ci-windows-update'

Updates to the CI settings.

* js/ci-windows-update:
  Azure Pipeline: switch to the latest agent pools
  ci: prevent `perforce` from being quarantined
  t/lib-httpd: avoid using macOS' sed
---

0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d
diff --cc t/t5537-fetch-shallow.sh
index 9e16512fe3,dd9cd4b51a..4f10057e9f
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@@ -243,16 -239,16 +243,16 @@@ test_expect_success 'shallow fetches ch
  	# with an empty packfile. This is done by refetching with a shorter
  	# depth (to ensure that the packfile is empty), and overwriting the
  	# shallow line in the response with the unshallow line we want.
 -	printf "s/0034shallow %s/0036unshallow %s/" \
 +	printf "$(test_oid sed)" \
  	       "$(git -C "$REPO" rev-parse HEAD)" \
  	       "$(git -C "$REPO" rev-parse HEAD^)" \
- 	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ 	       >"$HTTPD_ROOT_PATH/one-time-perl" &&
  	test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \
- 		fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \
+ 		fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \
  		master:a_branch &&
  
- 	# Ensure that the one-time-sed script was used.
- 	! test -e "$HTTPD_ROOT_PATH/one-time-sed" &&
+ 	# Ensure that the one-time-perl script was used.
+ 	! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&
  
  	# Ensure that the resulting repo is consistent, despite our failure to
  	# fetch.