Skip to contentSkip to conversation

t5537: adjust test_oid label

PATCH Superseded Johannes Schindelin via GitGitGadget 2 participants 3 messages Feb 27, 2020 – Mar 4, 2020

lore
Share & tools
lore

Johannes Schindelin via GitGitGadget

author
#0 lore raw

PATCH 1/1 t5537: adjust test_oid label

From: Johannes Schindelin <[email protected]>

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 <[email protected]>

---
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).

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-717%2Fdscho%2Fazure-pipelines-latest-pools-test_oid-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-717/dscho/azure-pipelines-latest-pools-test_oid-v1
Pull-Request: https://github.com/git/git/pull/717

 t/t5537-fetch-shallow.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
t/t5537-fetch-shallow.sh +3 -3
index 4f10057e9f1..4f681dbbe11 100755
@@ -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-perl" &&

base-commit: 4ee93512ad4f5270d941006faa162586e2d45f7a

Signature · 1 line
gitgitgadget
author
#1 lore raw

PATCH v2 1/1 t5537: adjust test_oid label

From: Johannes Schindelin <[email protected]>

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 <[email protected]>

---
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.

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(-)
t/t5537-fetch-shallow.sh +3 -3
index 9e16512fe31..287d2c336be 100755
@@ -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

Signature · 1 line
gitgitgadget
#2 lore raw

"Johannes Schindelin via GitGitGadget" <[email protected]>

Quoted 15 lines · writes:

From: Johannes Schindelin <[email protected]>

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 <[email protected]>

---
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).

Quoted 4 lines

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.

Quoted 45 lines

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(-)
t/t5537-fetch-shallow.sh +3 -3
index 9e16512fe31..287d2c336be 100755
@@ -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