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

use new git function

Browse source
This commit is contained in:
Joey Hess 2010-11-10 14:08:28 -04:00
parent e826368cec
commit 31101a8b27
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Command/Lock.hs
View file

@ -45,12 +45,6 @@ perform file = do
isLocked :: FilePath -> Annex Bool
isLocked file = do
g <- Annex.gitRepo
changed <- typechanged g Nothing
changedCached <- typechanged g $ Just "--cached"
typechanged <- liftIO $ Git.typeChangedFiles g file
s <- liftIO $ getSymbolicLinkStatus file
return $ null (changed++changedCached) || isSymbolicLink s
where
typechanged g Nothing = typechanged' g params
typechanged g (Just param) = typechanged' g $ params++[param]
typechanged' g p = liftIO $ Git.pipeRead g $ p++[file]
params = ["diff", "--name-only", "--diff-filter=T"]
return $ (not $ elem file typechanged) || isSymbolicLink s