summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Content.hs3
-rw-r--r--Annex/Ssh.hs4
2 files changed, 4 insertions, 3 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 2142d1f09..26b332e24 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -34,6 +34,7 @@ import Common.Annex
import Logs.Location
import Annex.UUID
import qualified Git
+import qualified Git.Config
import qualified Annex
import qualified Annex.Queue
import qualified Annex.Branch
@@ -303,7 +304,7 @@ saveState oneshot = doSideAction $ do
ifM alwayscommit
( Annex.Branch.commit "update" , Annex.Branch.stage)
where
- alwayscommit = fromMaybe True . Git.configTrue
+ alwayscommit = fromMaybe True . Git.Config.isTrue
<$> getConfig (annexConfig "alwayscommit") ""
{- Downloads content from any of a list of urls. -}
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index f0824b119..8bd4fe33a 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -14,7 +14,7 @@ import qualified Data.Map as M
import Common.Annex
import Annex.LockPool
-import qualified Git
+import qualified Git.Config
import Config
import qualified Build.SysConfig as SysConfig
import Annex.Perms
@@ -47,7 +47,7 @@ sshInfo (host, port) = ifM caching
)
where
caching = fromMaybe SysConfig.sshconnectioncaching
- . Git.configTrue
+ . Git.Config.isTrue
<$> getConfig (annexConfig "sshcaching") ""
cacheParams :: FilePath -> [CommandParam]