diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-17 12:26:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-17 13:54:14 -0400 |
| commit | da0a1360d7b57d034620338996552752ab873045 (patch) | |
| tree | 7cd5d994f15ae0d52e18321a129360b9e39a6d7d /Remote/Git.hs | |
| parent | 13ce429b5cbc3036e24613ce85e17af7acd9a480 (diff) | |
add annex-ignore-command and annex-sync-command configs
Added remote configuration settings annex-ignore-command and
annex-sync-command, which are dynamic equivilants of the annex-ignore
and annex-sync configurations.
For this I needed a new DynamicConfig infrastructure. Its implementation
should be as fast as before when there is no dynamic config, and it caches
so shell commands are only run once.
Note that annex-ignore-command exits nonzero when the remote should be ignored.
While that may seem backwards, it allows using the same command for it as
for annex-sync-command when you want to disable both.
This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 5c69473fd..b48b48b52 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -35,6 +35,7 @@ import qualified Annex.Url as Url import Utility.Tmp import Config import Config.Cost +import Config.DynamicConfig import Annex.Init import Annex.Version import Types.CleanupActions @@ -128,7 +129,8 @@ configRead :: Bool -> Git.Repo -> Annex Git.Repo configRead autoinit r = do gc <- Annex.getRemoteGitConfig r u <- getRepoUUID r - case (repoCheap r, remoteAnnexIgnore gc, u) of + annexignore <- liftIO $ getDynamicConfig (remoteAnnexIgnore gc) + case (repoCheap r, annexignore, u) of (_, True, _) -> return r (True, _, _) -> tryGitConfigRead autoinit r (False, _, NoUUID) -> tryGitConfigRead autoinit r |