diff options
author | Joey Hess <joey@kitenet.net> | 2014-03-19 14:49:01 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-03-19 15:57:56 -0400 |
commit | 0bc0364c5cd75695bc66181cc3bd52a4d26c4c87 (patch) | |
tree | 56bce6cf12e7cfdc7c591d3b36f56221c5b5a2d1 /Test.hs | |
parent | 3b0e263a342cf8a369fcea6b1e41e0533ba2cc7f (diff) |
Windows: Fix some filename encoding bugs.
http://git-annex.branchable.com/bugs/Unicode_file_names_ignored_on_Windows/
Not a complete fix yet.
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -22,7 +22,6 @@ import qualified Data.Map as M import System.IO.HVFS (SystemFS(..)) import qualified Text.JSON import System.Path -import qualified Data.ByteString.Lazy as L import Common @@ -1272,7 +1271,7 @@ test_add_subdirs env = intmpclonerepo env $ do {- Regression test for Windows bug where symlinks were not - calculated correctly for files in subdirs. -} git_annex env "sync" [] @? "sync failed" - l <- annexeval $ encodeW8 . L.unpack <$> Annex.CatFile.catObject (Git.Types.Ref "HEAD:dir/foo") + l <- annexeval $ decodeBS <$> Annex.CatFile.catObject (Git.Types.Ref "HEAD:dir/foo") "../.git/annex/" `isPrefixOf` l @? ("symlink from subdir to .git/annex is wrong: " ++ l) createDirectory "dir2" |