summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-20 13:15:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-20 13:15:59 -0400
commit483b1b08c6fad82d5e17aaaded398bdad94124f1 (patch)
tree1dc6d610a7947c2169d51e9ef7b575e315f8d34c /Command
parent5580af5789427fc5fd7cd74fd4a2529668621a68 (diff)
parent75b6ee81f9d9b921106c829380e30445415ec2f7 (diff)
Merge branch 'master' into watch
Diffstat (limited to 'Command')
-rw-r--r--Command/Unused.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 03a709534..b115eee83 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -10,8 +10,7 @@
module Command.Unused where
import qualified Data.Set as S
-import qualified Data.Text.Lazy as L
-import qualified Data.Text.Lazy.Encoding as L
+import qualified Data.ByteString.Lazy as L
import Data.BloomFilter
import Data.BloomFilter.Easy
import Data.BloomFilter.Hash
@@ -265,8 +264,9 @@ withKeysReferencedInGitRef a ref = do
go [] = noop
go (l:ls)
| isSymLink (LsTree.mode l) = do
- content <- L.decodeUtf8 <$> catFile ref (LsTree.file l)
- case fileKey (takeFileName $ L.unpack content) of
+ content <- encodeW8 . L.unpack
+ <$> catFile ref (LsTree.file l)
+ case fileKey (takeFileName content) of
Nothing -> go ls
Just k -> do
a k