| commit | ef1639145de771d33fe5b919f13debaaeaca35f7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Oct 2021 23:06:58 +0000 (25 16:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Oct 2021 23:06:58 +0000 (25 16:06 -0700) | ||
| tree | 720e51559205dd65805a5dd96fd25281bc67fa6c | treesnapshot (tar.gz zip) |
| parent | 18c6653da0be924f83415f987d76f6813b81f086 | commitdiff |
| parent | f3af71c947cdf2e5acd16cacf50586b829a68f6e | commitdiff |
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
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