diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-11 01:52:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-11 01:52:58 -0400 |
| commit | 637b5feb45013f69f3aacbafeb796de666d3faa3 (patch) | |
| tree | 17e5506c3715be46318d15dd76ec474641faffe2 /Git | |
| parent | b327227ba596d4fc5012138d03390c3eb861b808 (diff) | |
lint
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/LsFiles.hs | 2 | ||||
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs index bceee26fc..85215fe04 100644 --- a/Git/LsFiles.hs +++ b/Git/LsFiles.hs @@ -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] diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index 32966c846..30778d034 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -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 |