mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

copy, move: Behave same with --fast when sending to remotes located on a local disk as when sending to other remotes.

Browse source 
Let --fast override use of hasKey even when hasKeyCheap.
This commit is contained in:
Joey Hess 2017-09-29 16:30:43 -04:00
parent 799a432b68
commit f403c23bc6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -12,6 +12,8 @@ git-annex (6.20170926) UNRELEASED; urgency=medium
* external: Avoid checking EXPORTSUPPORTED for special remotes that are * external: Avoid checking EXPORTSUPPORTED for special remotes that are
not configured to use exports. not configured to use exports.
* test: Fix reversion that made it only run inside a git repository. * 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 -- Joey Hess <id@joeyh.name> Thu, 28 Sep 2017 12:01:39 -0400

2
Command/Move.hs
View file

@ -109,7 +109,7 @@ toStart move afile key ai dest = do
toStart' :: Remote -> Bool -> AssociatedFile -> Key -> ActionItem -> CommandStart toStart' :: Remote -> Bool -> AssociatedFile -> Key -> ActionItem -> CommandStart
toStart' dest move afile key ai = do toStart' dest move afile key ai = do
fast <- Annex.getState Annex.fast fast <- Annex.getState Annex.fast
if fast && not move && not (Remote.hasKeyCheap dest) if fast && not move
then ifM (expectedPresent dest key) then ifM (expectedPresent dest key)
( stop ( stop
, go True (pure $ Right False) , go True (pure $ Right False)