diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-29 16:30:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-29 16:30:43 -0400 |
| commit | a95a32c60d352e253b808c2b6c7cbbbc2ce9123b (patch) | |
| tree | 27ab06b46272ea063435c35ea2675fcf86f05cf7 | |
| parent | d10f4a97c05433d3cb9d77f6f6c2100c6d96b06d (diff) | |
copy, move: Behave same with --fast when sending to remotes located on a local disk as when sending to other remotes.
Let --fast override use of hasKey even when hasKeyCheap.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Command/Move.hs | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -12,6 +12,8 @@ git-annex (6.20170926) UNRELEASED; urgency=medium * external: Avoid checking EXPORTSUPPORTED for special remotes that are not configured to use exports. * test: Fix reversion that made it only run inside a git repository. + * copy, move: Behave same with --fast when sending to remotes located + on a local disk as when sending to other remotes. -- Joey Hess <id@joeyh.name> Thu, 28 Sep 2017 12:01:39 -0400 diff --git a/Command/Move.hs b/Command/Move.hs index 74aa430d3..c8867e391 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -109,7 +109,7 @@ toStart move afile key ai dest = do toStart' :: Remote -> Bool -> AssociatedFile -> Key -> ActionItem -> CommandStart toStart' dest move afile key ai = do fast <- Annex.getState Annex.fast - if fast && not move && not (Remote.hasKeyCheap dest) + if fast && not move then ifM (expectedPresent dest key) ( stop , go True (pure $ Right False) |