From 212442dd9b4733377928830cc848afcb54d3b53a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 May 2023 15:55:24 -0400 Subject: [PATCH] pullOption should be pushOption in seekExportContent sync: Fix bug that made --no-pull, rather than --no-push prevent exporting trees to special remotes. Sponsored-by: Joshua Antonishen on Patreon --- CHANGELOG | 2 ++ Command/Sync.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 02c5e316c5..d4064e6059 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,6 +49,8 @@ git-annex (10.20230408) UNRELEASED; urgency=medium * reinject: Fix support for operating on multiple pairs of files and keys. * importfeed: Support -J * 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. -- Joey Hess Sat, 08 Apr 2023 13:57:18 -0400 diff --git a/Command/Sync.hs b/Command/Sync.hs index def4d81c54..1a570a3780 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -912,7 +912,7 @@ seekExportContent :: Maybe SyncOptions -> [Remote] -> CurrBranch -> Annex Bool seekExportContent o rs (currbranch, _) = or <$> forM rs go where go r - | not (maybe True pullOption o) = return False + | not (maybe True pushOption o) = return False | not (remoteAnnexPush (Remote.gitconfig r)) = return False | otherwise = bracket (Export.openDb (Remote.uuid r)) -- 2.30.2