t/t7510-signed-commit.sh: Add %GP to custom format checks
Test %GP in addition to %GF in custom format checks. With current keyring, both have the same value. Signed-off-by: Michał Górny <mgorny@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michał Górny committed
Nov 4, 2018 at 10:47 UTC
1a550529b123f1b45334b6ed3d9b2c3e94e319e2
1 file changed
+12
-6
t/t7510-signed-commit.sh
+12
-6
@@ -176,8 +176,9 @@ test_expect_success GPG 'show good signature with custom format' '
176
13B6F51ECDDE430D
177
C O Mitter <committer@example.com>
178
73D758744BE721698EC54E8713B6F51ECDDE430D
179
+ 73D758744BE721698EC54E8713B6F51ECDDE430D
180
EOF
180
- git log -1 --format="%G?%n%GK%n%GS%n%GF" sixth-signed >actual &&
181
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
182
test_cmp expect actual
183
'
184
@@ -187,8 +188,9 @@ test_expect_success GPG 'show bad signature with custom format' '
188
13B6F51ECDDE430D
189
C O Mitter <committer@example.com>
190
191
+
192
EOF
191
- git log -1 --format="%G?%n%GK%n%GS%n%GF" $(cat forged1.commit) >actual &&
193
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
194
test_cmp expect actual
195
'
196
@@ -198,8 +200,9 @@ test_expect_success GPG 'show untrusted signature with custom format' '
200
61092E85B7227189
201
Eris Discordia <discord@example.net>
202
D4BE22311AD3131E5EDA29A461092E85B7227189
203
+ D4BE22311AD3131E5EDA29A461092E85B7227189
204
EOF
202
- git log -1 --format="%G?%n%GK%n%GS%n%GF" eighth-signed-alt >actual &&
205
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
206
test_cmp expect actual
207
'
208
@@ -209,8 +212,9 @@ test_expect_success GPG 'show unknown signature with custom format' '
212
61092E85B7227189
213
214
215
+
216
EOF
213
- GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF" eighth-signed-alt >actual &&
217
+ GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
218
test_cmp expect actual
219
'
220
@@ -220,8 +224,9 @@ test_expect_success GPG 'show lack of signature with custom format' '
224
225
226
227
+
228
EOF
224
- git log -1 --format="%G?%n%GK%n%GS%n%GF" seventh-unsigned >actual &&
229
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
230
test_cmp expect actual
231
'
232
@@ -261,8 +266,9 @@ test_expect_success GPG 'show double signature with custom format' '
266
267
268
269
+
270
EOF
265
- git log -1 --format="%G?%n%GK%n%GS%n%GF" $(cat double-commit.commit) >actual &&
271
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
272
test_cmp expect actual
273
'
274