[PATCH] t5601: mark protocol v2-only test

Jonathan Tan· May 4, 2021, 22:34 UTC · lore

A HTTP-clone test introduced in 4fe788b1b0 ("builtin/clone.c: add --reject-shallow option", 2021-04-01) only works in protocol v2, but is not marked as such.

The aforementioned patch implements --reject-shallow for a variety of situations, but usage of a protocol that requires a remote helper is not one of them. (Such an implementation would require extending the remote helper protocol to support the passing of a "reject shallow" option, and then teaching it to both protocol-speaking ends.)

For now, to make it pass when GIT_TEST_PROTOCOL_VERSION=0 is passed, add "-c protocol.version=2". A more complete solution would be either to augment the remote helper protocol to support this feature or to return a fatal error when using --reject-shallow with a protocol that uses a remote helper.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
I think the remote helper solution can be done by adding an "option"
(something that can be passed using the "option" command). We have
options for things like "from-promisor", for example. I haven't looked
into this in detail, though.
---
 t/t5601-clone.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t5601-clone.sh +1 −1

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 329ae599fd..c0688467e7 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -762,7 +762,7 @@ test_expect_success 'partial clone using HTTP' '
 test_expect_success 'reject cloning shallow repository using HTTP' '
 	test_when_finished "rm -rf repo" &&
 	git clone --bare --no-local --depth=1 src "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	test_must_fail git clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
+	test_must_fail git -c protocol.version=2 clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
 	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
 
 	git clone --no-reject-shallow $HTTPD_URL/smart/repo.git repo

-- 
2.31.1.527.g47e6f16901-goog

Junio C Hamano· May 5, 2021, 01:12 UTC · re: Jonathan Tan · lore

Re: [PATCH] t5601: mark protocol v2-only test

Jonathan Tan <jonathantanmy@google.com> writes:

Show 22 quoted lines

> A HTTP-clone test introduced in 4fe788b1b0 ("builtin/clone.c: add
> --reject-shallow option", 2021-04-01) only works in protocol v2, but is
> not marked as such.
>
> The aforementioned patch implements --reject-shallow for a variety of
> situations, but usage of a protocol that requires a remote helper is not
> one of them. (Such an implementation would require extending the remote
> helper protocol to support the passing of a "reject shallow" option, and
> then teaching it to both protocol-speaking ends.)
>
> For now, to make it pass when GIT_TEST_PROTOCOL_VERSION=0 is passed, add
> "-c protocol.version=2". A more complete solution would be either to
> augment the remote helper protocol to support this feature or to return
> a fatal error when using --reject-shallow with a protocol that uses a
> remote helper.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> I think the remote helper solution can be done by adding an "option"
> (something that can be passed using the "option" command). We have
> options for things like "from-promisor", for example. I haven't looked
> into this in detail, though.

Sounds like a good direction to go in. In the meantime, certainly this will work around the issue in the original test.

Will queue---thanks.

Show 16 quoted lines

>  t/t5601-clone.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
> index 329ae599fd..c0688467e7 100755
> --- a/t/t5601-clone.sh
> +++ b/t/t5601-clone.sh
> @@ -762,7 +762,7 @@ test_expect_success 'partial clone using HTTP' '
>  test_expect_success 'reject cloning shallow repository using HTTP' '
>  	test_when_finished "rm -rf repo" &&
>  	git clone --bare --no-local --depth=1 src "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
> -	test_must_fail git clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
> +	test_must_fail git -c protocol.version=2 clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
>  	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
>  
>  	git clone --no-reject-shallow $HTTPD_URL/smart/repo.git repo

patcht5601: mark protocol v2-only test