aboutsummaryrefslogtreecommitdiff
path: root/Remote/Git.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-09 09:58:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-09 10:02:15 -0400
commit6d3c84755bc79f04724a0f88975d7e9400395f10 (patch)
treee7cd10c5a1040a8044aa65b29891416c7a59733d /Remote/Git.hs
parent62dc499541761d43f9938b34561bc93bb3f67e4e (diff)
sync: support gcrypt4.20130909
Diffstat (limited to 'Remote/Git.hs')
-rw-r--r--Remote/Git.hs8
1 files changed, 8 insertions, 0 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 149146616..795823ca6 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -125,6 +125,14 @@ gen r u c gc
repoAvail :: Git.Repo -> Annex Bool
repoAvail r
| Git.repoIsHttp r = return True
+ | Git.GCrypt.isEncrypted r = do
+ g <- gitRepo
+ liftIO $ do
+ er <- Git.GCrypt.encryptedRepo g r
+ if Git.repoIsLocal er || Git.repoIsLocalUnknown er
+ then catchBoolIO $
+ void (Git.Config.read er) >> return True
+ else return True
| Git.repoIsUrl r = return True
| Git.repoIsLocalUnknown r = return False
| otherwise = liftIO $ catchBoolIO $ onLocal r $ return True