diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-17 17:54:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-17 18:48:53 -0400 |
| commit | 2d31b1e209f0dd1787f2ff9fac0e55f9e1216754 (patch) | |
| tree | 5a287c1c71c2da572f395799544b7773cfc69960 /Command/Mirror.hs | |
| parent | f31dbb13cad2e8e1b29180fff755026256eabd57 (diff) | |
better dup key with -J fix
This avoids all the complication about redundant work discussed in
the previous try at fixing this. At the expense of needing each command
that could have the problem to be patched to simply wrap the action in
onlyActionOn once the key is known. But there do not seem to be many
such commands.
onlyActionOn' should not be used with a CommandStart (or CommandPerform),
although the types do allow it. onlyActionOn handles running the whole
CommandStart chain. I couldn't immediately see a way to avoid mistken
use of onlyActionOn'.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Command/Mirror.hs')
| -rw-r--r-- | Command/Mirror.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Mirror.hs b/Command/Mirror.hs index a8f4307a2..941e397a4 100644 --- a/Command/Mirror.hs +++ b/Command/Mirror.hs @@ -53,7 +53,7 @@ start o file k = startKey o afile k (mkActionItem afile) afile = AssociatedFile (Just file) startKey :: MirrorOptions -> AssociatedFile -> Key -> ActionItem -> CommandStart -startKey o afile key ai = case fromToOptions o of +startKey o afile key ai = onlyActionOn key $ case fromToOptions o of ToRemote r -> checkFailedTransferDirection ai Upload $ ifM (inAnnex key) ( Command.Move.toStart False afile key ai =<< getParsed r , do |