Re: [PATCH] mingw: hot-fix t5615

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 11, 2016, 17:06 UTC
Message-ID: <xmqq37iy3q0s.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <f4336a7fa3df8c0b426c3d01ada8d7d8f38e588a.1478881741.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> That test made the incorrect assumption that the path separator character
> is always a colon. On Windows, it is a semicolon instead.

Documentation/git.txt says that GIT_ALTERNATE_OBJECT_DIRECTORIES is separated with ";" on Windows fairly clearly, and we should have caught that.

For the upcoming release there is no need for any further tweak on your fix I am responding to, but in the longer term we would want to turn this to path_sep=";" (or ":") and define it in the global t/test-lib.sh, as it is plausible that we may want to prepend or append to $PATH in the tests and that also needs ";" on Windows, no?

Are there other variables that is a list of paths that we care in our tests? I notice GIT_CEILING_DIRECTORIES does not have the corresponding ": separated (on windows ; separated) list" in its description in Documentation/git.txt but the documentation may need to be fixed there as well?

Thanks for a quick fix. Will apply on jk/alt-odb-cleanup and merge down.

Show 29 quoted lines

>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Published-As: https://github.com/dscho/git/releases/tag/t5615-path-separator-v1
> Fetch-It-Via: git fetch https://github.com/dscho/git t5615-path-separator-v1
>
> 	This is required, but not sufficient, to fix `master` on Windows.
>
>  t/t5615-alternate-env.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
> index 22d9d81..3aeffb6 100755
> --- a/t/t5615-alternate-env.sh
> +++ b/t/t5615-alternate-env.sh
> @@ -37,8 +37,10 @@ test_expect_success 'access alternate via absolute path' '
>  	EOF
>  '
>  
> +sep=:
> +test_have_prereq !MINGW || sep=\;
>  test_expect_success 'access multiple alternates' '
> -	check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
> +	check_obj "$(pwd)/one.git/objects$sep$(pwd)/two.git/objects" <<-EOF
>  	$one blob
>  	$two blob
>  	EOF
>
> base-commit: 0538b84027a8aba7e8b805e3ec8fceb3990023e5