From b26776d92fb3f124a450b0f8042cfe7a063a8b96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Jan 2016 17:46:46 -0400 Subject: [PATCH] fix parsing of v6 unlocked file The newline broke this ad-hoc parser; use the normal one. --- Command/Unused.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Command/Unused.hs b/Command/Unused.hs index a643cf8e07..1e404ac9f7 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -182,13 +182,13 @@ excludeReferenced refspec ks = runfilter firstlevel ks >>= runfilter secondlevel secondlevel = withKeysReferencedInGit refspec {- Given an initial value, folds it with each key referenced by - - symlinks in the git repo. -} + - files in the working tree. -} withKeysReferenced :: v -> (Key -> v -> v) -> Annex v withKeysReferenced initial a = withKeysReferenced' Nothing initial folda where folda k _ v = return $ a k v -{- Runs an action on each referenced key in the git repo. -} +{- Runs an action on each referenced key in the working tree. -} withKeysReferencedM :: (Key -> Annex ()) -> Annex () withKeysReferencedM a = withKeysReferenced' Nothing () calla where @@ -271,8 +271,8 @@ withKeysReferencedInGitRef a ref = do liftIO $ void clean where tKey True = lookupFile . getTopFilePath . DiffTree.file - tKey False = fileKey . takeFileName . decodeBS <$$> - catFile ref . getTopFilePath . DiffTree.file + tKey False = parseLinkOrPointer + <$$> catFile ref . getTopFilePath . DiffTree.file data UnusedMaps = UnusedMaps { unusedMap :: UnusedMap