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

pullOption should be pushOption in seekExportContent

Browse source 
sync: Fix bug that made --no-pull, rather than --no-push prevent exporting
trees to special remotes.

Sponsored-by: Joshua Antonishen on Patreon
This commit is contained in:
Joey Hess 2023-05-16 15:55:24 -04:00
parent 705b7e2d36
commit 212442dd9b
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

@ -49,6 +49,8 @@ git-annex (10.20230408) UNRELEASED; urgency=medium
* reinject: Fix support for operating on multiple pairs of files and keys. * reinject: Fix support for operating on multiple pairs of files and keys.
* importfeed: Support -J * importfeed: Support -J
* importfeed: Support --json-progress * importfeed: Support --json-progress
* sync: Fix bug that made --no-pull, rather than --no-push prevent
exporting trees to special remotes.
* uninit: Avoid buffering the names of all annexed files in memory. * uninit: Avoid buffering the names of all annexed files in memory.
-- Joey Hess <id@joeyh.name> Sat, 08 Apr 2023 13:57:18 -0400 -- Joey Hess <id@joeyh.name> Sat, 08 Apr 2023 13:57:18 -0400

2
Command/Sync.hs
View file

@ -912,7 +912,7 @@ seekExportContent :: Maybe SyncOptions -> [Remote] -> CurrBranch -> Annex Bool
seekExportContent o rs (currbranch, _) = or <$> forM rs go seekExportContent o rs (currbranch, _) = or <$> forM rs go
where where
go r go r
| not (maybe True pullOption o) = return False | not (maybe True pushOption o) = return False
| not (remoteAnnexPush (Remote.gitconfig r)) = return False | not (remoteAnnexPush (Remote.gitconfig r)) = return False
| otherwise = bracket | otherwise = bracket
(Export.openDb (Remote.uuid r)) (Export.openDb (Remote.uuid r))