summaryrefslogtreecommitdiff
path: root/Assistant/Threads/MountWatcher.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-22 15:09:40 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-22 15:09:40 -0400
commit26e4e65307436e4cc9a2db448141652b79d0f582 (patch)
tree6f99054b23d84e22d285d951c45f5274d5015026 /Assistant/Threads/MountWatcher.hs
parente4f714d1be7b4341d08e10f1305b24c25da6d70e (diff)
filter out special remotes when pulling
Diffstat (limited to 'Assistant/Threads/MountWatcher.hs')
-rw-r--r--Assistant/Threads/MountWatcher.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index f32e04314..bfdfe0ebb 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -159,8 +159,9 @@ handleMount st dstatus mntent = do
rs <- remotesUnder st dstatus mntent
unless (null rs) $ do
branch <- runThreadState st $ Command.Sync.currentBranch
- debug thisThread ["pulling from", show rs]
- runThreadState st $ manualPull branch rs
+ let pullrs = filter Git.repoIsLocal rs
+ debug thisThread ["pulling from", show pullrs]
+ runThreadState st $ manualPull branch pullrs
-- TODO queue transfers for new files in both directions
where