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

Fix a bug in find --branch in the previous version

Browse source 
inAnnex check was lost for that code path. To avoid more such mistakes,
made withKeyOptions check it when the AnnexedFileSeeker specifies.
This commit is contained in:
Joey Hess 2020-07-24 12:05:28 -04:00
parent 2d771a7d32
commit 00865cdae8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
12 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Get.hs
View file

@ -46,7 +46,7 @@ seek o = startConcurrency downloadStages $ do
, usesLocationLog = True
}
case batchOption o of
NoBatch -> withKeyOptions (keyOptions o) (autoMode o)
NoBatch -> withKeyOptions (keyOptions o) (autoMode o) seeker
(commandAction . startKeys from)
(withFilesInGitAnnex ww seeker)
=<< workTreeItems ww (getFiles o)
@ -66,8 +66,7 @@ start o from file key = start' expensivecheck from key afile ai
startKeys :: Maybe Remote -> (Key, ActionItem) -> CommandStart
startKeys from (key, ai) = checkFailedTransferDirection ai Download $
stopUnless (not <$> inAnnex key) $
start' (return True) from key (AssociatedFile Nothing) ai
start' (return True) from key (AssociatedFile Nothing) ai
start' :: Annex Bool -> Maybe Remote -> Key -> AssociatedFile -> ActionItem -> CommandStart
start' expensivecheck from key afile ai =