diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-03 13:40:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-03 13:58:53 -0400 |
| commit | 4cded2bc85d530dd335738cb870daf3a2d4e4a2f (patch) | |
| tree | 6b84dd8cf04f9fa17d3de55c17e4139278f398bd /Assistant | |
| parent | c35b2728cffdb98fa3b962505ebb0f1d2304ecce (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 'Assistant')
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 4b82a799d..90bb3dc78 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -42,6 +42,7 @@ import Annex.InodeSentinal import Git.Types import Git.FilePath import Config +import Config.GitConfig import Utility.ThreadScheduler import Logs.Location import qualified Database.Keys @@ -83,7 +84,7 @@ instance E.Exception WatcherControl watchThread :: NamedThread watchThread = namedThread "Watcher" $ - ifM (liftAnnex $ annexAutoCommit <$> Annex.getGitConfig) + ifM (liftAnnex $ getGitConfigVal annexAutoCommit) ( runWatcher , waitFor ResumeWatcher runWatcher ) |