Skip to content

Commit cc6ee97

Browse files
Michael J Grubergitster
authored andcommitted
Documentation/technical: signed merge tag format
Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eda2f11 commit cc6ee97

File tree

1 file changed

+74
-0
lines changed

1 file changed

+74
-0
lines changed

Documentation/technical/signature-format.txt

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,77 @@ signed commit
110110

111111
signed commit message body
112112
----
113+
114+
== Mergetag signatures
115+
116+
- created by: `git merge` on signed tag
117+
- payload/embedding: the whole signed tag object is embedded into
118+
the (merge) commit object as header entry `mergetag`
119+
- example: merge of the signed tag `signedtag` as above
120+
121+
----
122+
tree c7b1cff039a93f3600a1d18b82d26688668c7dea
123+
parent c33429be94b5f2d3ee9b0adad223f877f174b05d
124+
parent 04b871796dc0420f8e7561a895b52484b701d51a
125+
author A U Thor <[email protected]> 1465982009 +0000
126+
committer C O Mitter <[email protected]> 1465982009 +0000
127+
mergetag object 04b871796dc0420f8e7561a895b52484b701d51a
128+
type commit
129+
tag signedtag
130+
tagger C O Mitter <[email protected]> 1465981006 +0000
131+
132+
signed tag
133+
134+
signed tag message body
135+
-----BEGIN PGP SIGNATURE-----
136+
Version: GnuPG v1
137+
138+
iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
139+
rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
140+
8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
141+
q8FWEqPPUbSJXoMbRPw04S5jrLtZSsUWbRYjmJCHzlhSfFWW4eFd37uquIaLUBS0
142+
rkC3Jrx7420jkIpgFcTI2s60uhSQLzgcCwdA2ukSYIRnjg/zDkj8+3h/GaROJ72x
143+
lZyI6HWixKJkWw8lE9aAOD9TmTW9sFJwcVAzmAuFX2kUreDUKMZduGcoRYGpD7E=
144+
=jpXa
145+
-----END PGP SIGNATURE-----
146+
147+
Merge tag 'signedtag' into downstream
148+
149+
signed tag
150+
151+
signed tag message body
152+
153+
# gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189
154+
# gpg: Good signature from "Eris Discordia <[email protected]>"
155+
# gpg: WARNING: This key is not certified with a trusted signature!
156+
# gpg: There is no indication that the signature belongs to the owner.
157+
# Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189
158+
----
159+
160+
- verify with: verification is embedded in merge commit message by default,
161+
alternatively with `git show --show-signature`:
162+
163+
----
164+
commit 9863f0c76ff78712b6800e199a46aa56afbcbd49
165+
merged tag 'signedtag'
166+
gpg: Signature made Wed Jun 15 10:56:46 2016 CEST using RSA key ID B7227189
167+
gpg: Good signature from "Eris Discordia <[email protected]>"
168+
gpg: WARNING: This key is not certified with a trusted signature!
169+
gpg: There is no indication that the signature belongs to the owner.
170+
Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189
171+
Merge: c33429b 04b8717
172+
Author: A U Thor <[email protected]>
173+
Date: Wed Jun 15 09:13:29 2016 +0000
174+
175+
Merge tag 'signedtag' into downstream
176+
177+
signed tag
178+
179+
signed tag message body
180+
181+
# gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189
182+
# gpg: Good signature from "Eris Discordia <[email protected]>"
183+
# gpg: WARNING: This key is not certified with a trusted signature!
184+
# gpg: There is no indication that the signature belongs to the owner.
185+
# Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189
186+
----

0 commit comments

Comments
 (0)