diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-31 12:47:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-31 12:47:08 -0400 |
| commit | a46a3ce0208f4471368a4070ebd12835375491a5 (patch) | |
| tree | f00d962cd08c370673dca0d943323d04f5519750 | |
| parent | 402d8ca3b29bfe500ebcbec82bc0d3b2168b6100 (diff) | |
improve type
| -rw-r--r-- | CmdLine/Seek.hs | 4 | ||||
| -rw-r--r-- | Command/FindRef.hs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index 66cd985f4..556a108eb 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -77,12 +77,12 @@ withFilesNotInGit skipdotfiles a params go l = seekActions $ prepFiltered a $ return $ concat $ segmentPaths params l -withFilesInRefs :: (FilePath -> Key -> CommandStart) -> CmdParams -> CommandSeek +withFilesInRefs :: (FilePath -> Key -> CommandStart) -> [Git.Ref] -> CommandSeek withFilesInRefs a = mapM_ go where go r = do matcher <- Limit.getMatcher - (l, cleanup) <- inRepo $ LsTree.lsTree (Git.Ref r) + (l, cleanup) <- inRepo $ LsTree.lsTree r forM_ l $ \i -> do let f = getTopFilePath $ LsTree.file i v <- catKey (LsTree.sha i) diff --git a/Command/FindRef.hs b/Command/FindRef.hs index cb14371e0..93315bcef 100644 --- a/Command/FindRef.hs +++ b/Command/FindRef.hs @@ -9,6 +9,7 @@ module Command.FindRef where import Command import qualified Command.Find as Find +import qualified Git cmd :: Command cmd = withGlobalOptions nonWorkTreeMatchingOptions $ Find.mkCommand $ @@ -17,4 +18,4 @@ cmd = withGlobalOptions nonWorkTreeMatchingOptions $ Find.mkCommand $ paramRef (seek <$$> Find.optParser) seek :: Find.FindOptions -> CommandSeek -seek o = Find.start o `withFilesInRefs` Find.findThese o +seek o = Find.start o `withFilesInRefs` (map Git.Ref $ Find.findThese o) |