lint
This commit is contained in:
parent
b327227ba5
commit
637b5feb45
26 changed files with 71 additions and 102 deletions
|
@ -20,7 +20,7 @@ import Utility.SafeCommand
|
|||
|
||||
{- Scans for files that are checked into git at the specified locations. -}
|
||||
inRepo :: [FilePath] -> Repo -> IO [FilePath]
|
||||
inRepo l repo = pipeNullSplit (Params "ls-files --cached -z --" : map File l) repo
|
||||
inRepo l = pipeNullSplit $ Params "ls-files --cached -z --" : map File l
|
||||
|
||||
{- Scans for files at the specified locations that are not checked into git. -}
|
||||
notInRepo :: Bool -> [FilePath] -> Repo -> IO [FilePath]
|
||||
|
|
|
@ -37,7 +37,7 @@ merge x y repo = do
|
|||
- the index are preserved (and participate in the merge). -}
|
||||
merge_index :: Repo -> [String] -> IO ()
|
||||
merge_index repo bs =
|
||||
update_index repo =<< concat <$> mapM (\b -> merge_tree_index b repo) bs
|
||||
update_index repo =<< concat <$> mapM (`merge_tree_index` repo) bs
|
||||
|
||||
{- Feeds a list into update-index. Later items in the list can override
|
||||
- earlier ones, so the list can be generated from any combination of
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue