diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-04-05 13:04:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-04-05 13:22:35 -0400 |
| commit | 2d8cbcafa66a317fcb3d571cd8bf45962d651998 (patch) | |
| tree | 9c39bb0de77d3570e403d29acc99ac04ead4de89 /Types | |
| parent | d3f440e599ee0271a7a6e8c441e5d00b3c9548e3 (diff) | |
Added remote.<name>.annex-push and remote.<name>.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.<name>.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.<name>.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.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 4 |
1 files changed, 4 insertions, 0 deletions
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" |