diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-22 14:57:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-22 14:57:09 -0400 |
| commit | 8655ea7f8e853b7de4defbca2655b741362ecd21 (patch) | |
| tree | 685b461a9e6471dbf403bb281d4382661a36d245 /Assistant/Sync.hs | |
| parent | 032c802d45c7872f704de1faf0733740b256444d (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 'Assistant/Sync.hs')
| -rw-r--r-- | Assistant/Sync.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 78fdbab1a..727749c4f 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -68,7 +68,9 @@ reconnectRemotes notifypushes rs = void $ do go = do (failed, diverged) <- sync =<< liftAnnex (inRepo Git.Branch.current) - addScanRemotes diverged nonxmppremotes + addScanRemotes diverged $ + filter (not . remoteAnnexIgnore . Remote.gitconfig) + nonxmppremotes return failed {- Updates the local sync branch, then pushes it to all remotes, in |