From: Johannes Sixt <j6t@kdbg•org>
To: "René Scharfe" <rene.scharfe@lsrfire•ath.cx>
Cc: Git Mailing List <git@vger•kernel.org>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] fix t1504 on Windows
Date: Fri, 06 Feb 2009 20:23:47 +0100 [thread overview]
Message-ID: <498C8E43.8010108@kdbg.org> (raw)
In-Reply-To: <498C70C8.1080009@lsrfire.ath.cx>
René Scharfe schrieb:
> Johannes Sixt schrieb:
>> I also need this to complete this test:
>>
>> diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh
>> index 9c9c4c9..e377d48 100755
>> --- a/t/t1504-ceiling-dirs.sh
>> +++ b/t/t1504-ceiling-dirs.sh
>> @@ -93,13 +93,13 @@ GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi"
>> test_prefix subdir_ceil_at_subdi_slash "sub/dir/"
>>
>>
>> -GIT_CEILING_DIRECTORIES="foo:$TRASH_ROOT/sub"
>> +GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub"
>> test_fail second_of_two
>>
>> GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:/bar"
>> test_fail first_of_two
>>
>> -GIT_CEILING_DIRECTORIES="foo:$TRASH_ROOT/sub:bar"
>> +GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub:/bar"
>> test_fail second_of_three
>
> I don't, which makes me uneasy -- the tests shouldn't depend on details
> in our setup. :-/
I updated my msysgit to the current master this moment, and I still need
these two changes. Do you use an older msysgit? With 31d5dfeb0
(2008-06-08) Steffen changed path mangling so that a text without a
leading / or . is not converted. That's exactly what we see here.
>> That said, I'm in the process of preparing a series that includes your
>> patch and that does the proper cleanup and code moving that you again
>> didn't do :-/ But it turns out that this is non-trivial because of bash's
>> (MSYS's) I-know-better-what-is-a-path-and-what-not behavior. It will take
>> some time...
>
> Glad to hear the first part, but what code moving do you mean? Something
> like the following?
>
> -- snip! --
> Remove the unused function normalize_absolute_path() and its tests.
No, that's not enough. I mean something more like this (but I'll not
include the diff itself):
Johannes Sixt (4):
Make test-path-utils more robust against incorrect use
Move sanitary_path_copy to path.c (and rename to
normalize_path_copy)
Test and fix normalize_path_copy()
Remove unused normalize_absolute_path()
René Scharfe (1):
Fix t1504 on Windows
cache.h | 2 +-
path.c | 124 +++++++++++++++++++++++++------------
setup.c | 88 +--------------------------
t/t0060-path-utils.sh | 26 ++++----
t/t1504-ceiling-dirs.sh | 2 +-
test-path-utils.c | 12 +++-
6 files changed, 107 insertions(+), 147 deletions(-)
-- Hannes
next prev parent reply other threads:[~2009-02-06 19:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 23:00 [PATCH] fix crash in path.c on Windows René Scharfe
2009-02-04 23:51 ` Junio C Hamano
2009-02-05 7:57 ` Johannes Sixt
2009-02-05 16:48 ` René Scharfe
2009-02-05 17:13 ` Johannes Sixt
2009-02-05 20:41 ` Robin Rosenberg
2009-02-05 19:35 ` [PATCH] fix t1504 " René Scharfe
2009-02-06 12:55 ` Johannes Sixt
2009-02-06 13:11 ` Johannes Schindelin
2009-02-06 13:17 ` Johannes Sixt
2009-02-06 13:26 ` Johannes Schindelin
2009-02-06 13:36 ` Johannes Sixt
2009-02-06 17:18 ` René Scharfe
2009-02-06 19:23 ` Johannes Sixt [this message]
2009-02-06 21:45 ` René Scharfe
2009-02-07 15:08 ` [PATCH 0/5] Consolidate path normalization functions Johannes Sixt
2009-02-07 15:08 ` [PATCH 1/5] Make test-path-utils more robust against incorrect use Johannes Sixt
2009-02-07 15:08 ` [PATCH 2/5] Move sanitary_path_copy() to path.c and rename it to normalize_path_copy() Johannes Sixt
2009-02-07 15:08 ` [PATCH 3/5] Fix GIT_CEILING_DIRECTORIES on Windows Johannes Sixt
2009-02-07 15:08 ` [PATCH 4/5] Test and fix normalize_path_copy() Johannes Sixt
2009-02-07 15:08 ` [PATCH 5/5] Remove unused normalize_absolute_path() Johannes Sixt
2009-02-08 0:08 ` [PATCH 4/5] Test and fix normalize_path_copy() Robin Rosenberg
2009-02-08 8:52 ` Johannes Sixt
2009-02-08 14:46 ` René Scharfe
2009-02-08 15:50 ` Johannes Sixt
2009-02-07 0:25 ` [PATCH] fix t1504 on Windows René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=498C8E43.8010108@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=rene.scharfe@lsrfire$(echo .)ath.cx \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox