From f403c23bc6ccfe34b46d93c2eb638245fbeca93a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 Sep 2017 16:30:43 -0400 Subject: [PATCH] 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. --- CHANGELOG | 2 ++ Command/Move.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d1c23953c6..a84187e633 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 Thu, 28 Sep 2017 12:01:39 -0400 diff --git a/Command/Move.hs b/Command/Move.hs index 74aa430d30..c8867e3911 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)