From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Jan 2022 23:11:41 +0000 (-0800)
Subject: Merge branch 'fs/ssh-signing-key-lifetime'
X-Git-Tag: v2.35.0-rc1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cde28af37b19e07139ebb6a355d742e763b7a235;p=thirdparty%2Fgit.git

Merge branch 'fs/ssh-signing-key-lifetime'

"git merge $signed_tag" started to drop the tag message from the
default merge message it uses by accident, which has been corrected.

* fs/ssh-signing-key-lifetime:
  fmt-merge-msg: prevent use-after-free with signed tags
---

cde28af37b19e07139ebb6a355d742e763b7a235