diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-05 18:43:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-05 18:43:04 (GMT) |
| commit | 0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d (patch) | |
| tree | 3f8b9c871ee77448710e5e6b7f1064844c4a8dd0 /t/t5537-fetch-shallow.sh | |
| parent | f3ccd9f0d963a09994e4f934efdd71ea837b6e7b (diff) | |
| parent | 7f487ce062cb09f5e58ca0594396ef66a16934e2 (diff) | |
| download | git-0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d.zip git-0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d.tar.gz git-0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d.tar.bz2 | |
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
Diffstat (limited to 't/t5537-fetch-shallow.sh')
| -rwxr-xr-x | t/t5537-fetch-shallow.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index 9e16512..4f10057 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -237,7 +237,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f git -C "$REPO" config protocol.version 2 && git -C client config protocol.version 2 && - git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch && + git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch && # Craft a situation in which the server sends back an unshallow request # with an empty packfile. This is done by refetching with a shorter @@ -246,13 +246,13 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f 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. |