summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-26 16:44:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-26 16:44:14 -0400
commitb7903eb2d149ceb164d7422fb56573735d83ebde (patch)
tree83203e2fbc2ce7a6f5e24cfb23bfcc1b821d96cf /Command
parent7f6af79232eee685daf58e72737c5284f80cf482 (diff)
move partitioning out of keyPossibilities
And a bug fix in passing.
Diffstat (limited to 'Command')
-rw-r--r--Command/Move.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Move.hs b/Command/Move.hs
index d52ca07df..3eadf30c6 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -110,8 +110,8 @@ toCleanup dest move key = do
fromStart :: Git.Repo -> Bool -> CommandStartString
fromStart src move file = isAnnexed file $ \(key, _) -> do
g <- Annex.gitRepo
- (trusted, untrusted, _) <- Remotes.keyPossibilities key
- if (g == src) || (null $ filter (\r -> Remotes.same r src) (trusted ++ untrusted))
+ (remotes, _) <- Remotes.keyPossibilities key
+ if (g == src) || (null $ filter (\r -> Remotes.same r src) remotes)
then return Nothing
else do
showAction move file