Browse Source

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>
maint
Michał Górny 6 years ago committed by Junio C Hamano
parent
commit
1a550529b1
  1. 18
      t/t7510-signed-commit.sh

18
t/t7510-signed-commit.sh

@ -176,8 +176,9 @@ test_expect_success GPG 'show good signature with custom format' ' @@ -176,8 +176,9 @@ test_expect_success GPG 'show good signature with custom format' '
13B6F51ECDDE430D
C O Mitter <committer@example.com>
73D758744BE721698EC54E8713B6F51ECDDE430D
73D758744BE721698EC54E8713B6F51ECDDE430D
EOF
git log -1 --format="%G?%n%GK%n%GS%n%GF" sixth-signed >actual &&
git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
test_cmp expect actual
'

@ -187,8 +188,9 @@ test_expect_success GPG 'show bad signature with custom format' ' @@ -187,8 +188,9 @@ test_expect_success GPG 'show bad signature with custom format' '
13B6F51ECDDE430D
C O Mitter <committer@example.com>


EOF
git log -1 --format="%G?%n%GK%n%GS%n%GF" $(cat forged1.commit) >actual &&
git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
test_cmp expect actual
'

@ -198,8 +200,9 @@ test_expect_success GPG 'show untrusted signature with custom format' ' @@ -198,8 +200,9 @@ test_expect_success GPG 'show untrusted signature with custom format' '
61092E85B7227189
Eris Discordia <discord@example.net>
D4BE22311AD3131E5EDA29A461092E85B7227189
D4BE22311AD3131E5EDA29A461092E85B7227189
EOF
git log -1 --format="%G?%n%GK%n%GS%n%GF" eighth-signed-alt >actual &&
git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
test_cmp expect actual
'

@ -209,8 +212,9 @@ test_expect_success GPG 'show unknown signature with custom format' ' @@ -209,8 +212,9 @@ test_expect_success GPG 'show unknown signature with custom format' '
61092E85B7227189



EOF
GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF" eighth-signed-alt >actual &&
GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
test_cmp expect actual
'

@ -220,8 +224,9 @@ test_expect_success GPG 'show lack of signature with custom format' ' @@ -220,8 +224,9 @@ test_expect_success GPG 'show lack of signature with custom format' '




EOF
git log -1 --format="%G?%n%GK%n%GS%n%GF" seventh-unsigned >actual &&
git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
test_cmp expect actual
'

@ -261,8 +266,9 @@ test_expect_success GPG 'show double signature with custom format' ' @@ -261,8 +266,9 @@ test_expect_success GPG 'show double signature with custom format' '




EOF
git log -1 --format="%G?%n%GK%n%GS%n%GF" $(cat double-commit.commit) >actual &&
git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
test_cmp expect actual
'


Loading…
Cancel
Save