diff options
Diffstat (limited to 'Command/Unused.hs')
| -rw-r--r-- | Command/Unused.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs index 34d8ac232..ccb9c48d8 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -152,12 +152,13 @@ excludeReferenced l = do (S.fromList l) where -- Skip the git-annex branches, and get all other unique refs. - refs = map last . + refs = map Git.Ref . + last . nubBy cmpheads . filter ourbranches . map words . lines . L.unpack cmpheads a b = head a == head b - ourbranchend = '/' : Annex.Branch.name + ourbranchend = '/' : show (Annex.Branch.name) ourbranches ws = not $ ourbranchend `isSuffixOf` last ws removewith [] s = return $ S.toList s removewith (a:as) s @@ -188,7 +189,7 @@ getKeysReferenced = do return $ map fst $ catMaybes keypairs {- List of keys referenced by symlinks in a git ref. -} -getKeysReferencedInGit :: String -> Annex [Key] +getKeysReferencedInGit :: Git.Ref -> Annex [Key] getKeysReferencedInGit ref = do showAction $ "checking " ++ Git.refDescribe ref findkeys [] =<< inRepo (LsTree.lsTree ref) |