summaryrefslogtreecommitdiff
path: root/Command/Move.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-01 12:34:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-01 12:34:06 -0400
commited7fc4fce919af6b10a4ab098f72862060ed750f (patch)
treeb52f0846935cc3887f4a916f39e1651521d34d86 /Command/Move.hs
parenta6af9f153058b37b3ec68c45bf23054363d8dea2 (diff)
Bugfix: copy --to --fast never really copied, fixed.
Diffstat (limited to 'Command/Move.hs')
-rw-r--r--Command/Move.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Command/Move.hs b/Command/Move.hs
index 3ac5a7ab2..951695d66 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -89,8 +89,10 @@ toPerform dest move key = do
-- and an explicit check is not done, when copying. When moving,
-- it has to be done, to avoid inaverdent data loss.
fast <- Annex.getState Annex.fast
- isthere <- if fast && not move
- then return $ Right True
+ isthere <- if fast && not move && not (Remote.hasKeyCheap dest)
+ then do
+ (remotes, _) <- Remote.keyPossibilities key
+ return $ Right $ dest `elem` remotes
else Remote.hasKey dest key
case isthere of
Left err -> do