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

6
Command/Add.hs
View file

@ -11,6 +11,7 @@ import Control.Monad.State (liftIO)
import System.Posix.Files
import Command
import qualified Annex
import qualified AnnexQueue
import qualified Backend
import LocationLog
@ -60,5 +61,8 @@ cleanup file key = do
let mtime = modificationTime s
liftIO $ touch file (TimeSpec mtime) False
AnnexQueue.add "add" [Param "--"] file
force <- Annex.getState Annex.force
if force
then AnnexQueue.add "add" [Param "-f", Param "--"] file
else AnnexQueue.add "add" [Param "--"] file
return True