From b9fe55705f19fc39889da6157714039047aed4c9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Oct 2015 15:54:37 -0400 Subject: 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..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. --- doc/git-annex-reinject.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/git-annex-reinject.mdwn') diff --git a/doc/git-annex-reinject.mdwn b/doc/git-annex-reinject.mdwn index f5019e4b5..fb175015b 100644 --- a/doc/git-annex-reinject.mdwn +++ b/doc/git-annex-reinject.mdwn @@ -14,8 +14,8 @@ which should be an already annexed file whose content is not present. This can be useful if you have obtained the content of a file from elsewhere and want to put it in the local annex. -Automatically runs fsck on dest to check that the expected content was -provided. +Verifies that the src file's content matches with the content that the dest +file is expected to have, and refuses to reinject it otherwise. Example: -- cgit v1.2.3