diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
commit | ef1639145de771d33fe5b919f13debaaeaca35f7 (patch) | |
tree | 720e51559205dd65805a5dd96fd25281bc67fa6c /Documentation/config | |
parent | Merge branch 'fs/ssh-signing' (diff) | |
parent | gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint() (diff) | |
download | tgif-ef1639145de771d33fe5b919f13debaaeaca35f7.tar.xz |
Merge branch 'fs/ssh-signing-fix'
Fix-up for the other topic already in 'next'.
* fs/ssh-signing-fix:
gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint()
gpg-interface: fix leak of "line" in parse_ssh_output()
ssh signing: clarify trustlevel usage in docs
ssh signing: fmt-merge-msg tests & config parse
Diffstat (limited to 'Documentation/config')
-rw-r--r-- | Documentation/config/gpg.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 51a756b2f1..4f30c7dbdd 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -52,9 +52,7 @@ gpg.ssh.allowedSignersFile:: SSH has no concept of trust levels like gpg does. To be able to differentiate between valid signatures and trusted signatures the trust level of a signature verification is set to `fully` when the public key is present in the allowedSignersFile. -Therefore to only mark fully trusted keys as verified set gpg.minTrustLevel to `fully`. -Otherwise valid but untrusted signatures will still verify but show no principal -name of the signer. +Otherwise the trust level is `undefined` and git verify-commit/tag will fail. + This file can be set to a location outside of the repository and every developer maintains their own trust store. A central repository server could generate this |