From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Oct 2021 23:06:58 +0000 (-0700)
Subject: Merge branch 'fs/ssh-signing-fix'
X-Git-Tag: v2.34.0-rc0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef1639145de771d33fe5b919f13debaaeaca35f7;p=thirdparty%2Fgit.git

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
---

ef1639145de771d33fe5b919f13debaaeaca35f7