Stepan Kasal <ka...@ucw.cz> writes:

> From: Pat Thoyts <pattho...@users.sourceforge.net>
>
> The path in a .git platform independent link file needs to be absolute
> and under mingw we need it to be a windows type path, not a unix style
> path so it should start with a drive letter and not a /.

OK.   We seem to have uses of "pwd -P" in other tests; don't they
need a similar treatment, and if not why not?

>
> Signed-off-by: Pat Thoyts <pattho...@users.sourceforge.net>
> Signed-off-by: Stepan Kasal <ka...@ucw.cz>
> ---
>  t/t9902-completion.sh | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 1d1c106..f10a752 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -212,9 +212,18 @@ test_expect_success '__gitdir - non-existing $GIT_DIR' '
>       )
>  '
>  
> +function pwd_P_W () {
> +     if test_have_prereq MINGW
> +     then
> +             pwd -W
> +     else
> +             pwd -P
> +     fi
> +}
> +
>  test_expect_success '__gitdir - gitfile in cwd' '
> -     echo "$(pwd -P)/otherrepo/.git" >expected &&
> -     echo "gitdir: $TRASH_DIRECTORY/otherrepo/.git" >subdir/.git &&
> +     echo "$(pwd_P_W)/otherrepo/.git" >expected &&
> +     echo "gitdir: $(pwd_P_W)/otherrepo/.git" >subdir/.git &&
>       test_when_finished "rm -f subdir/.git" &&
>       (
>               cd subdir &&
> @@ -224,8 +233,8 @@ test_expect_success '__gitdir - gitfile in cwd' '
>  '
>  
>  test_expect_success '__gitdir - gitfile in parent' '
> -     echo "$(pwd -P)/otherrepo/.git" >expected &&
> -     echo "gitdir: $TRASH_DIRECTORY/otherrepo/.git" >subdir/.git &&
> +     echo "$(pwd_P_W)/otherrepo/.git" >expected &&
> +     echo "gitdir: $(pwd_P_W)/otherrepo/.git" >subdir/.git &&
>       test_when_finished "rm -f subdir/.git" &&
>       (
>               cd subdir/subsubdir &&
> -- 
> 2.0.0.9635.g0be03cb
>
> -- 
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to