summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-25 19:15:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-25 19:15:29 -0400
commit12b89a3eb81fdac92ec3ea9633bbd9a7d6a72adb (patch)
treeea35600752cf95dab1522257ee722d29b39fee27 /Annex/Content.hs
parentc3fbe07d7ad03944d0967ebfa2b8f65cbc2ad5dc (diff)
configure: Check if ssh connection caching is supported by the installed version of ssh and default annex.sshcaching accordingly.
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index f328051e3..fdd03f320 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -313,7 +313,8 @@ saveState :: Bool -> Annex ()
saveState oneshot = do
Annex.Queue.flush False
unless oneshot $ do
- alwayscommit <- Git.configTrue <$> fromRepo (Git.Config.get "annex.alwayscommit" "true")
+ alwayscommit <- fromMaybe True . Git.configTrue
+ <$> fromRepo (Git.Config.get "annex.alwayscommit" "")
if alwayscommit
then Annex.Branch.commit "update"
else Annex.Branch.stage