From 2d8cbcafa66a317fcb3d571cd8bf45962d651998 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 5 Apr 2017 13:04:02 -0400 Subject: Added remote..annex-push and remote..annex-pull The former can be useful to make remotes that don't get fully synced with local changes, which comes up in a lot of situations. The latter was mostly added for symmetry, but could be useful (though less likely to be). Implementing `remote..annex-pull` was a bit tricky, as there's no one place where git-annex pulls/fetches from remotes. I audited all instances of "fetch" and "pull". A few cases were left not checking this config: * Git.Repair can try to pull missing refs from a remote, and if the local repo is corrupted, that seems a reasonable thing to do even though the config would normally prevent it. * Assistant.WebApp.Gpg and Remote.Gcrypt and Remote.Git do fetches as part of the setup process of a remote. The config would probably not be set then, and having the setup fail seems worse than honoring it if it is already set. I have not prevented all the code that does a "merge" from merging branches from remotes with remote..annex-pull=false. That could perhaps be done, but it would need a way to map from branch name to remote name, and the way refspecs work makes that hard to get really correct. So if the user fetches manually, the git-annex branch will get merged, for example. Anther way of looking at/justifying this is that the setting is called "annex-pull", not "annex-merge". This commit was supported by the NSF-funded DataLad project. --- Types/GitConfig.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Types') diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index af699a7b9..da548d478 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -181,6 +181,8 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexCostCommand :: Maybe String , remoteAnnexIgnore :: Bool , remoteAnnexSync :: Bool + , remoteAnnexPull :: Bool + , remoteAnnexPush :: Bool , remoteAnnexReadOnly :: Bool , remoteAnnexVerify :: Bool , remoteAnnexTrustLevel :: Maybe String @@ -218,6 +220,8 @@ extractRemoteGitConfig r remotename = RemoteGitConfig , remoteAnnexCostCommand = notempty $ getmaybe "cost-command" , remoteAnnexIgnore = getbool "ignore" False , remoteAnnexSync = getbool "sync" True + , remoteAnnexPull = getbool "pull" True + , remoteAnnexPush = getbool "push" True , remoteAnnexReadOnly = getbool "readonly" False , remoteAnnexVerify = getbool "verify" True , remoteAnnexTrustLevel = notempty $ getmaybe "trustlevel" -- cgit v1.2.3