diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-03-29 11:07:40 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-03-29 11:07:40 -0400 |
commit | e193da8230e0d758acd09cd82d653acf8088304f (patch) | |
tree | 95b6ba691a67109acfae9010f1bf56c78651d62c /Command | |
parent | aedbb77de224cec157da35a0718a66e45493979e (diff) | |
parent | 495fad0cad63e9712b0236e57759f49565b7b70c (diff) |
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'Command')
-rw-r--r-- | Command/Unused.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs index b6f3e93b6..8040dc21a 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -27,6 +27,7 @@ import qualified Remote import qualified Annex.Branch import Annex.Link import Annex.CatFile +import Annex.WorkTree import Types.RefSpec import Git.Types import Git.Sha @@ -215,10 +216,7 @@ withKeysReferenced' mdir initial a = do Just dir -> inRepo $ LsFiles.inRepo [dir] go v [] = return v go v (f:fs) = do - mk <- getM id - [ isAnnexLink f - , liftIO (isPointerFile f) - ] + mk <- lookupFile f case mk of Nothing -> go v fs Just k -> do |