diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-17 15:59:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-17 15:59:37 -0400 |
| commit | 4e74c0d7f33a66eb524ef020ef4401fa322db34c (patch) | |
| tree | d0a239d6022339b3cb5afeced2d3f859aa4d02d3 /Assistant | |
| parent | 963f2c5726ce0fe899038733d4318a234d355268 (diff) | |
test suite passes in direct mode
This fixes a bug with git annex add in direct mode. If some files already
existed in the tree pointing at the same key as a file that was just added,
and their content was not present, add neglected to copy the content to
those files.
I also changed the behavior of moveAnnex slightly: When content is moved
into the annex in direct mode, it does not overwrite any content already
present in direct mode files. That content may be modified after all.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 88efa39d8..2c124776d 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -30,12 +30,12 @@ import qualified Git import qualified Git.UpdateIndex import qualified Git.LsFiles as LsFiles import qualified Backend -import Annex.Content import Annex.Direct import Annex.Content.Direct import Annex.CatFile import Annex.Link import Annex.FileMatcher +import Annex.ReplaceFile import Git.Types import Config import Utility.ThreadScheduler |