mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix indent for readability

Browse source
This commit is contained in:
Joey Hess 2024-03-08 13:38:46 -04:00
parent 5a3ed3f910
commit 1115fb1f9b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Git/UnionMerge.hs
View file

@ -87,11 +87,11 @@ mergeFile :: S.ByteString -> RawFilePath -> HashObjectHandle -> CatFileHandle ->
mergeFile info file hashhandle h = case S8.words info of mergeFile info file hashhandle h = case S8.words info of
[_colonmode, _bmode, asha, bsha, _status] -> [_colonmode, _bmode, asha, bsha, _status] ->
case filter (`notElem` nullShas) [Ref asha, Ref bsha] of case filter (`notElem` nullShas) [Ref asha, Ref bsha] of
[] -> return Nothing [] -> return Nothing
(sha:[]) -> use sha (sha:[]) -> use sha
shas -> use shas -> use
=<< either return (hashBlob hashhandle . L8.unlines) =<< either return (hashBlob hashhandle . L8.unlines)
=<< calcMerge . zip shas <$> mapM getcontents shas =<< calcMerge . zip shas <$> mapM getcontents shas
_ -> return Nothing _ -> return Nothing
where where
use sha = return $ Just $ use sha = return $ Just $