diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
| commit | af45d422248846869babdbc3eae2765d94ea9f20 (patch) | |
| tree | 6f1bea8cc19dedcd8ca40c046718f7f96e7454f8 /Command | |
| parent | 5034d8c2985dafeb141bba383ab70d75729b3cb6 (diff) | |
| parent | b3aaf980e460c2287fc1ef2b262685b1879e6ed0 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Add.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 29a1518e8..5133ee1fd 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -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 |