Merge branch 'master' into borg

This commit is contained in:
Joey Hess 2020-12-18 15:27:24 -04:00
commit 909318dcee
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 16 additions and 3 deletions

View file

@ -211,8 +211,9 @@ seek' o = do
let gitremotes = filter (Remote.gitSyncableRemoteType . Remote.remotetype) remotes
dataremotes <- filter (\r -> Remote.uuid r /= NoUUID)
<$> filterM (not <$$> liftIO . getDynamicConfig . remoteAnnexIgnore . Remote.gitconfig) remotes
let (exportremotes, keyvalueremotes) = partition (exportTree . Remote.config) dataremotes
let (exportremotes, nonexportremotes) = partition (exportTree . Remote.config) dataremotes
let importremotes = filter (importTree . Remote.config) dataremotes
let keyvalueremotes = partition (not . importTree . Remote.config) nonexportremotes
if cleanupOption o
then do