Merge branch 'master' into v3
Conflicts: debian/changelog
This commit is contained in:
commit
af45d42224
6 changed files with 29 additions and 9 deletions
|
@ -142,7 +142,8 @@ withFilesMissing a params = do
|
|||
withFilesNotInGit :: CommandSeekBackendFiles
|
||||
withFilesNotInGit a params = do
|
||||
repo <- Annex.gitRepo
|
||||
newfiles <- liftIO $ runPreserveOrder (Git.notInRepo repo) params
|
||||
force <- Annex.getState Annex.force
|
||||
newfiles <- liftIO $ runPreserveOrder (Git.notInRepo repo force) params
|
||||
newfiles' <- filterFiles newfiles
|
||||
backendPairs a newfiles'
|
||||
withWords :: CommandSeekWords
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue