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

Merge branch 'master' into v3

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-06-29 11:42:35 -04:00
commit af45d42224
6 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command.hs
View file

@ -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