aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 13:50:00 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 13:55:15 -0400
commitcde3a924aec6bcd47ede650572bffa8c414243cf (patch)
treedaf3c2b27c92372035e712a34668dd17133539e2 /doc/git-annex.mdwn
parent48119806dd24214e88f3f3c62f4dcb14b60dc207 (diff)
make fsck check annex.securehashesonly, and new tip for working around SHA1 collisions with git-annex
This commit was sponsored by andrea rota.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 1c905766d..2f7635f41 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -829,6 +829,18 @@ Here are all the supported configuration settings.
This is overridden by annex annex.backend configuration in the
.gitattributes files.
+* `annex.securehashesonly`
+
+ Set to true to indicate that the repository should only use
+ cryptographically secure hashes
+ (SHA2, SHA3) and not insecure hashes (MD5, SHA1) for content.
+
+ When this is set, the contents of files using cryptographically
+ insecure hashes will not be allowed to be added to the repository.
+
+ Also, git-annex fsck` will complain about any files present in
+ the repository that use insecure hashes.
+
* `annex.diskreserve`
Amount of disk space to reserve. Disk space is checked when transferring