summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-06 16:01:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-06 16:07:25 -0400
commitf758f6d5cbef989bff75fcd140edb8e0b8899b84 (patch)
treec7832b9d65a1a0411662f4d3fb6a6f9f1868a065 /Command
parentd653a5842f8a070e7d53a6f8fcd7838106efeee7 (diff)
Bugfix: Direct mode no longer repeatedly checksums duplicated files.
Fixed by storing a list of cached inodes for a key, instead of just one. Backwards compatability note: An old git-annex version will fail to parse an inode cache file that has been written by a new version, and has multiple items. It will succees if just one. So old git-annexes will have even worse behavior when there are duplicated files, if that is possible. I don't think it will be a problem. (Famous last words.) Also, note that it doesn't expire old and unused inode caches for a key. It would be possible to add this if needed; just look through the associated files for a key and if there are more cached inodes, throw out any not corresponding to associated files. Unless a file is being copied repeatedly and the old copy deleted, this lack of expiry should not be a problem.
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index 30e989e4c..a5dfc1d1c 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -132,7 +132,7 @@ ingest (Just source) = do
goindirect Nothing _ = failure
godirect (Just (key, _)) (Just cache) = do
- writeInodeCache key cache
+ addInodeCache key cache
finishIngestDirect key source
return $ Just key
godirect _ _ = failure