summaryrefslogtreecommitdiff
path: root/Remote.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 14:57:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 14:57:09 -0400
commit8655ea7f8e853b7de4defbca2655b741362ecd21 (patch)
tree685b461a9e6471dbf403bb281d4382661a36d245 /Remote.hs
parent032c802d45c7872f704de1faf0733740b256444d (diff)
sync, assistant: Sync with remotes that have annex-ignore set
This is so git remotes on servers without git-annex installed can be used to keep clients' git repos in sync. This is a behavior change, but since annex-sync can be set to disable syncing with a remote, I think it's acceptable.
Diffstat (limited to 'Remote.hs')
-rw-r--r--Remote.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote.hs b/Remote.hs
index 27e69a5a0..e722542a8 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -19,7 +19,6 @@ module Remote (
remoteTypes,
remoteList,
- enabledRemoteList,
specialRemote,
remoteMap,
uuidDescriptions,
@@ -211,7 +210,8 @@ keyPossibilities' key trusted = do
let validtrusteduuids = validuuids `intersect` trusted
-- remotes that match uuids that have the key
- allremotes <- enabledRemoteList
+ allremotes <- filter (not . remoteAnnexIgnore . gitconfig)
+ <$> remoteList
let validremotes = remotesWithUUID allremotes validuuids
return (sortBy (comparing cost) validremotes, validtrusteduuids)