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

convert isPointerFile from Annex to IO

Browse source
This commit is contained in:
Joey Hess 2016-01-01 13:22:38 -04:00
parent 00f0411d12
commit a2c056df65
Failed to extract signature
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/AutoMerge.hs
View file

@ -248,7 +248,7 @@ cleanConflictCruft resolvedks resolvedfs unstagedmap = do
| S.member f fs || S.member (conflictCruftBase f) fs = anyM id
[ pure (S.member i is)
, inks <$> isAnnexLink f
, inks <$> isPointerFile f
, inks <$> liftIO (isPointerFile f)
]
| otherwise = return False