diff options
| author | Fabian Stelzer <fs@gigacodes.de> | 2021-12-09 08:52:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-09 21:38:04 (GMT) |
| commit | 122842fd93eefadac237cfd73a4227b65c8b78ee (patch) | |
| tree | a919c9db6e68603d6d0fa1c71e2fbde04385257e /fmt-merge-msg.c | |
| parent | dd3aa418aa109ff3697290ba89b626c3a4b36883 (diff) | |
| download | git-122842fd93eefadac237cfd73a4227b65c8b78ee.zip git-122842fd93eefadac237cfd73a4227b65c8b78ee.tar.gz git-122842fd93eefadac237cfd73a4227b65c8b78ee.tar.bz2 | |
ssh signing: make fmt-merge-msg consider key lifetime
Set the payload_type for check_signature() when generating merge messages to
verify merged tags signatures key lifetimes.
Implements the same tests as for verify-commit.
Signed-off-by: Fabian Stelzer <fs@gigacodes.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index deca1ea..e4f7810 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -533,6 +533,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) else { buf = payload.buf; len = payload.len; + sigc.payload_type = SIGNATURE_PAYLOAD_TAG; sigc.payload = strbuf_detach(&payload, &sigc.payload_len); if (check_signature(&sigc, sig.buf, sig.len) && !sigc.output) |