summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-06 17:46:46 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-06 17:46:46 -0400
commit336a5da9097f9f2d6aa92188a05c5e7658f5a087 (patch)
tree58648b865ab04ccf91439c78ae842a3763986421
parent83d2d587f4ebad1aa9d21e32424c24d8e7436ce3 (diff)
fix parsing of v6 unlocked file
The newline broke this ad-hoc parser; use the normal one.
-rw-r--r--Command/Unused.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs
index a643cf8e0..1e404ac9f 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