Re: [PATCH v6 06/10] t5500: Test case for diag-url

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 21, 2013, 23:27 UTC
Message-ID: <xmqqfvqp2v50.fsf@gitster.dls.corp.google.com>
In-Reply-To: <201311212140.58804.tboegi@web.de>

Torsten Bögershausen <tboegi@web.de> writes:

Show 21 quoted lines

> Add test cases using git fetch-pack --diag-url:
>
> - parse out host and path for URLs with a scheme (git:// file:// ssh://)
> - parse host names embedded by [] correctly
> - extract the port number, if present
> - seperate URLs like "file" (which are local)
>   from URLs like "host:repo" which should use ssh
> ---
>  t/t5500-fetch-pack.sh | 72 +++++++++++++++++++++++++++++++++++++++------------
>  1 file changed, 56 insertions(+), 16 deletions(-)
>
> diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> index 9136f2a..7f55b95 100755
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -533,7 +533,7 @@ test_expect_success 'shallow fetch with tags does not break the repository' '
>  '
>  check_prot_path() {
>  	> actual &&
> -	(git fetch-pack --diag-url "$1" 2>&1 1>stdout) | grep -v host= >actual &&
> +	(git fetch-pack --diag-url  "$1" 2>&1 1>stdout) | grep -v host= >actual &&

What is this change about???

Show 9 quoted lines

>  	echo "Diag: url=$1" >expected &&
>  	echo "Diag: protocol=$2" >>expected &&
>  	echo "Diag: path=$3" >>expected &&
> @@ -542,7 +542,7 @@ check_prot_path() {
>  
>  check_prot_host_path() {
>  	> actual &&
> -	git fetch-pack --diag-url "$1" 2>actual &&
> +	git fetch-pack --diag-url  "$1" 2>actual &&

Likewise...

Show 12 quoted lines

> @@ -564,29 +564,69 @@ do
>  				hh=$h
>  				pp=$p
>  			fi
> -			test_expect_success "fetch-pack $p://$h/$r" '
> +			test_expect_success "fetch-pack --diag-url $p://$h/$r" '
>  				check_prot_host_path $p://$h/$r $pp "$hh" "/$r"
>  			'
> -			# "/~" -> "~" conversion for git
> -			test_expect_success "fetch-pack $p://$h/~$r" '
> +			# "/~" -> "~" conversion
> +			test_expect_success "fetch-pack --diag-url $p://$h/~$r" '

Is this part, especially the "s/ for git//" bit, an "oops, the earlier one was wrong" fix to [05/10]? If so, please don't. Instead, please get it right in that patch before sending the series out.