summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-03 13:40:14 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-03 13:58:53 -0400
commit4cded2bc85d530dd335738cb870daf3a2d4e4a2f (patch)
tree6b84dd8cf04f9fa17d3de55c17e4139278f398bd /Command
parentc35b2728cffdb98fa3b962505ebb0f1d2304ecce (diff)
annex.autocommit can be configured via git-annex config
... to control the default behavior in all clones of a repository. This includes a new Configurable data type, so the GitConfig type indicates which values can be configured this way. The implementation should be quite efficient; the config log is only read once, and only when a Configurable value has not already been set by git-config. Indeed, it would be nice in the future to extend this, so that git-config is itself only read on demand. Some commands may not need to look at the git configuration at all. This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'Command')
-rw-r--r--Command/Sync.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 85f1f2f2c..e69790799 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -39,6 +39,7 @@ import qualified Git.Ref
import qualified Git
import qualified Remote.Git
import Config
+import Config.GitConfig
import Annex.Wanted
import Annex.Content
import Command.Get (getKey')
@@ -237,7 +238,7 @@ commit o = stopUnless shouldcommit $ next $ next $ do
)
where
shouldcommit = pure (commitOption o)
- <&&> (annexAutoCommit <$> Annex.getGitConfig)
+ <&&> getGitConfigVal annexAutoCommit
commitMsg :: Annex String
commitMsg = do