Merge branch 'master' into borg

This commit is contained in:
Joey Hess 2020-12-18 16:05:09 -04:00
commit 771b6c64f0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -213,7 +213,7 @@ seek' o = do
<$> filterM (not <$$> liftIO . getDynamicConfig . remoteAnnexIgnore . Remote.gitconfig) remotes <$> filterM (not <$$> liftIO . getDynamicConfig . remoteAnnexIgnore . Remote.gitconfig) remotes
let (exportremotes, nonexportremotes) = partition (exportTree . Remote.config) dataremotes let (exportremotes, nonexportremotes) = partition (exportTree . Remote.config) dataremotes
let importremotes = filter (importTree . Remote.config) dataremotes let importremotes = filter (importTree . Remote.config) dataremotes
let keyvalueremotes = partition (not . importTree . Remote.config) nonexportremotes let keyvalueremotes = filter (not . importTree . Remote.config) nonexportremotes
if cleanupOption o if cleanupOption o
then do then do