| Message ID | pull.717.v2.git.git.1583337192946.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] t5537: adjust test_oid label | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > We recently switched to using Perl instead of `sed` in the httpd-based > tests. Let's reflect that in the label we give the corresponding commit > hashes. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > Follow-up for "ci: upgrade to the latest Azure Pipelines agent pools" > > This is a companion patch for https://github.com/git/git/pull/714, > adding a patch that would not apply to maint but applies to master. It > is intended to be applied on top of the merge that pulls in the agent > pool upgrade (which in turn is intended to be applied on top of maint). > > Changes since v1: > > * Rebased onto master, as it now has all the building blocks needed for > this. A timely update that is very much appreciated. Will apply. Thanks. > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-717%2Fdscho%2Fazure-pipelines-latest-pools-test_oid-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-717/dscho/azure-pipelines-latest-pools-test_oid-v2 > Pull-Request: https://github.com/git/git/pull/717 > > Range-diff vs v1: > > 1: 79ad5eaa75b ! 1: a6e4e9cc6ad t5537: adjust test_oid label > @@ -30,4 +30,4 @@ > + printf "$(test_oid perl)" \ > "$(git -C "$REPO" rev-parse HEAD)" \ > "$(git -C "$REPO" rev-parse HEAD^)" \ > - >"$HTTPD_ROOT_PATH/one-time-perl" && > + >"$HTTPD_ROOT_PATH/one-time-sed" && > > > t/t5537-fetch-shallow.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh > index 9e16512fe31..287d2c336be 100755 > --- a/t/t5537-fetch-shallow.sh > +++ b/t/t5537-fetch-shallow.sh > @@ -17,8 +17,8 @@ test_expect_success 'setup' ' > commit 4 && > git config --global transfer.fsckObjects true && > test_oid_cache <<-EOF > - sed sha1:s/0034shallow %s/0036unshallow %s/ > - sed sha256:s/004cshallow %s/004eunshallow %s/ > + perl sha1:s/0034shallow %s/0036unshallow %s/ > + perl sha256:s/004cshallow %s/004eunshallow %s/ > EOF > ' > > @@ -243,7 +243,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f > # 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 "$(test_oid sed)" \ > + printf "$(test_oid perl)" \ > "$(git -C "$REPO" rev-parse HEAD)" \ > "$(git -C "$REPO" rev-parse HEAD^)" \ > >"$HTTPD_ROOT_PATH/one-time-sed" && > > base-commit: 2f268890c2cd2f115424936bbee27f8269080e5e
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index 9e16512fe31..287d2c336be 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -17,8 +17,8 @@ test_expect_success 'setup' ' commit 4 && git config --global transfer.fsckObjects true && test_oid_cache <<-EOF - sed sha1:s/0034shallow %s/0036unshallow %s/ - sed sha256:s/004cshallow %s/004eunshallow %s/ + perl sha1:s/0034shallow %s/0036unshallow %s/ + perl sha256:s/004cshallow %s/004eunshallow %s/ EOF ' @@ -243,7 +243,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f # 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 "$(test_oid sed)" \ + printf "$(test_oid perl)" \ "$(git -C "$REPO" rev-parse HEAD)" \ "$(git -C "$REPO" rev-parse HEAD^)" \ >"$HTTPD_ROOT_PATH/one-time-sed" &&