]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/ci-windows-update'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:04 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:04 +0000 (10:43 -0800)
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

1  2 
t/t5537-fetch-shallow.sh
t/t5616-partial-clone.sh
t/t5703-upload-pack-ref-in-want.sh

index 9e16512fe31b9bbb64c88093c5c317299a0e5735,dd9cd4b51a2dd0d881c732f673bbdd89943de651..4f10057e9f1ebb7d812ecdadfc12af2e4d4607ea
@@@ -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.
Simple merge
Simple merge