Steffen Prohaska <prohaska@xxxxxx> writes: > Unfortunately, I had no time to start the real work of fixing the > issues that are tested below. That's fine. We are not in a hurry. > But at least the tests should be in > good shape now and could be applied. I do not think we would want to see "FIXED" on systems that already behave sanely, so we would want a fix-up like this on top of your patch, and it would be a good to go. I do not have a handy way to test this, though, so can you try it out and make sure test_case and test_unicode are set to test_expect_failure correctly on problematic filesystems? Thanks. -- t/t0050-filesystem.sh | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index a0ab02e..b395c22 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -4,6 +4,34 @@ test_description='Various filesystem issues' . ./test-lib.sh +auml=`perl -CO -e 'print pack("U",0x00E4)'` +aumlcdiar=`perl -CO -e 'print pack("U",0x0061).pack("U",0x0308)'` + +test_expect_success 'see if we expect ' ' + + test_case=test_expect_success + test_unicode=test_expect_success + mkdir junk && + echo good >junk/CamelCase && + echo bad >junk/camelcase && + if test "$(cat junk/CamelCase)" != good + then + test_camel=test_expect_failure + say "will test on a case insensitive filesystem" + fi && + rm -fr junk && + mkdir junk && + >junk/"$auml" && + case "$(cd junk && echo *)" in + "$aumlcdiar") + test_unicode=test_expect_failure + say "will test on a unicode corrupting filesystem" + ;; + *) ;; + esac && + rm -fr junk +' + test_expect_success "setup case tests" ' touch camelcase && @@ -18,22 +46,20 @@ test_expect_success "setup case tests" ' ' -test_expect_failure 'rename (case change)' ' +$test_case 'rename (case change)' ' git mv camelcase CamelCase && git commit -m "rename" ' -test_expect_failure 'merge (case change)' ' +$test_case 'merge (case change)' ' git reset --hard initial && git merge topic ' -auml=`perl -CO -e 'print pack("U",0x00E4)'` -aumlcdiar=`perl -CO -e 'print pack("U",0x0061).pack("U",0x0308)'` test_expect_success "setup unicode normalization tests" " test_create_repo unicode && @@ -50,14 +76,14 @@ test_expect_success "setup unicode normalization tests" " " -test_expect_failure 'rename (silent unicode normalization)' " +$test_unicode 'rename (silent unicode normalization)' " git mv $aumlcdiar $auml && git commit -m \"rename\" " -test_expect_failure 'merge (silent unicode normalization)' ' +$test_unicode 'merge (silent unicode normalization)' ' git reset --hard initial && git merge topic - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html