fix deadlock

Fix a deadlock that could occur after git-annex got an unlocked file,
causing the command to hang indefinitely.

Known to happen on vfat filesystems, possibly others.

Note that a deadlock is still theoretically possible, if anything
smudge --clean does causes it to run the git queue for some other
reason.

Apparently that doesn't happen, but will need to keep an eye on it.
This commit is contained in:
Joey Hess 2020-06-18 12:56:29 -04:00
parent 82381211fa
commit d5451afc8f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 36 additions and 15 deletions

View file

@ -151,6 +151,7 @@ data AnnexState = AnnexState
, cachedcurrentbranch :: (Maybe (Maybe Git.Branch, Maybe Adjustment))
, cachedgitenv :: Maybe (AltIndexFile, FilePath, [(String, String)])
, urloptions :: Maybe UrlOptions
, insmudgecleanfilter :: Bool
}
newState :: GitConfig -> Git.Repo -> IO AnnexState
@ -209,6 +210,7 @@ newState c r = do
, cachedcurrentbranch = Nothing
, cachedgitenv = Nothing
, urloptions = Nothing
, insmudgecleanfilter = False
}
{- Makes an Annex state object for the specified git repo.