Re: Bug: t5813 failing on Cygwin

From: Jeff King <peff@peff.net>
Date: Nov 8, 2015, 05:10 UTC
Message-ID: <20151108051059.GB19191@sigill.intra.peff.net>
In-Reply-To: <1446930165.16957.9.camel@kaarsemaker.net>

On Sat, Nov 07, 2015 at 10:02:45PM +0100, Dennis Kaarsemaker wrote:

Show 18 quoted lines

> Looks like lib-proto-disable.sh's fake SSH doesn't strip double leading
> /'es from the path. Try this patch:
> 
> diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable
> -ssh.sh
> index ad877d7..a954ead 100755
> --- a/t/t5813-proto-disable-ssh.sh
> +++ b/t/t5813-proto-disable-ssh.sh
> @@ -14,7 +14,7 @@ test_expect_success 'setup repository to clone' '
>  '
>  
>  test_proto "host:path" ssh "remote:repo.git"
> -test_proto "ssh://" ssh "ssh://remote/$PWD/remote/repo.git"
> -test_proto "git+ssh://" ssh "git+ssh://remote/$PWD/remote/repo.git"
> +test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git"
> +test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git"
>  
>  test_done

Good catch. It's a shame that the resulting URL becomes a little less readable, but given that the damage is limited to this one test, I think we can live with it. Working around it in the fake ssh script would probably end up unnecessarily complex.

We may want to have git itself remove extra slashes from URLs, as Ramsay suggested elsewhere, but I would worry about regressions. Let's solve this test portability problem by itself, and we can consider the other as a separate topic if anybody wants to pursue it.

Dennis, can you roll up a full patch with a commit message?

-Peff