diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-10-01 15:54:37 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-10-01 15:56:39 -0400 |
commit | b9fe55705f19fc39889da6157714039047aed4c9 (patch) | |
tree | 107888b257bfcf370353bce2969897046be3af33 /Remote | |
parent | 55d635e356ecae2dd90d8cea355656faf3b24db1 (diff) |
Do verification of checksums of annex objects downloaded from remotes.
* When annex objects are received into git repositories, their checksums are
verified then too.
* To get the old, faster, behavior of not verifying checksums, set
annex.verify=false, or remote.<name>.annex-verify=false.
* setkey, rekey: These commands also now verify that the provided file
matches the key, unless annex.verify=false.
* reinject: Already verified content; this can now be disabled by
setting annex.verify=false.
recvkey and reinject already did verification, so removed now duplicate
code from them. fsck still does its own verification, which is ok since it
does not use getViaTmp, so verification doesn't happen twice when using fsck
--from.
Diffstat (limited to 'Remote')
-rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 1b5b2ab42..ada2055f2 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -502,7 +502,7 @@ copyToRemote' r key file p ensureInitialized runTransfer (Transfer Download u key) file noRetry noObserver $ const $ Annex.Content.saveState True `after` - Annex.Content.getViaTmp key + Annex.Content.getViaTmp (Annex.Content.RemoteVerify r) key (\dest -> mkCopier hardlink params object dest >>= \a -> a p <&&> liftIO checksuccessio) ) |