]> git.99rst.org Git - git.git/commitdiff
git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90d242d c39fc06)
Merge branch 'fs/ssh-signing-key-lifetime'
authorJunio C Hamano <redacted>
Wed, 12 Jan 2022 23:11:41 +0000 (15:11 -0800)
committerJunio C Hamano <redacted>
Wed, 12 Jan 2022 23:11:41 +0000 (15:11 -0800)
"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

1  2 
fmt-merge-msg.c patch | diff1 | diff2 | blob | history
t/t6200-fmt-merge-msg.sh patch | diff1 | diff2 | blob | history

diff --cc fmt-merge-msg.c
Simple merge
diff --cc t/t6200-fmt-merge-msg.sh
Simple merge
git clone https://git.99rst.org/PROJECT