Re: t0008-ignores failure (was: Git for Windows 1.8.3)

From: Pat Thoyts <patthoyts@gmail.com>
Date: May 30, 2013, 15:45 UTC
Message-ID: <CABNJ2GKPvbYFgqGL-g3Pnp7OghpoSfeuPEF0vNHixhQFkY+Uow@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.1305301713400.650@s15462909.onlinehome-server.info>

On 30 May 2013 16:15, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 32 quoted lines

> Hi Karsten,
>
> On Thu, 30 May 2013, Karsten Blees wrote:
>
>> Am 25.05.2013 21:16, schrieb Pat Thoyts:
>> > On that note -- with this merge as it now stands I get the following
>> > test failures:
>> >
>> > t0008-ignores.sh                     155, 158, 162, 164
>>
>> These tests fail because they use absolute paths, e.g. "C:/.../global-excludes", which is then translated to "C<NUL>/.../global-excludes". Can be fixed like so:
>>
>> --- 8< ---
>> --- a/t/t0008-ignores.sh
>> +++ b/t/t0008-ignores.sh
>> @@ -5,7 +5,7 @@ test_description=check-ignore
>>  . ./test-lib.sh
>>
>>  init_vars () {
>> -       global_excludes="$(pwd)/global-excludes"
>> +       global_excludes="global-excludes"
>>  }
>>
>>  enable_global_excludes () {
>> ---
>
> Since I do not have time for the lengthy, undirected discussion upstream
> seems to want to start, let's make your change, but only conditional on
> MINGW?
>
> Ciao,
> Dscho

I was just testing this -- I've already wrapped the suggested fix within a "test_have_prereq MINGW" for our fork and committed it. This was an issue partly because was alias pwd to "pwd -W" and so always get Windows paths. It means the test here doesn't check absolute paths but I think we can live with that. I tried using $(builtin pwd) to avoid the "-W" but it didn't help and I still got C: style paths.

I also grabbed Karsten's patch "dir.c: fix ignore processing within not-ignored directories" as this appears to deal with a .gitignore regression in 1.8.3. We can carry this until the next merge with upstream.

-- 
-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.