Merge branch 'nd/format-patch-cover-letter-stat-width'

diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 4e37ff8f169615a893ee5d0594ff056b0284b724..86d3f93fa22e45ba9dda24c49ec02df14e22ebc3 100755 (executable)
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -175,8 +175,10 @@ test_expect_success GPG 'show good signature with custom format' '
        G
        13B6F51ECDDE430D
        C O Mitter <committer@example.com>
+       73D758744BE721698EC54E8713B6F51ECDDE430D
+       73D758744BE721698EC54E8713B6F51ECDDE430D
        EOF
-       git log -1 --format="%G?%n%GK%n%GS" sixth-signed >actual &&
+       git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
        test_cmp expect actual
 '
 
@@ -185,28 +187,34 @@ test_expect_success GPG 'show bad signature with custom format' '
        B
        13B6F51ECDDE430D
        C O Mitter <committer@example.com>
+
+
        EOF
-       git log -1 --format="%G?%n%GK%n%GS" $(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
 '
 
 test_expect_success GPG 'show untrusted signature with custom format' '
        cat >expect <<-\EOF &&
        U
-       61092E85B7227189
+       65A0EEA02E30CAD7
        Eris Discordia <discord@example.net>
+       F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
+       D4BE22311AD3131E5EDA29A461092E85B7227189
        EOF
-       git log -1 --format="%G?%n%GK%n%GS" 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
 '
 
 test_expect_success GPG 'show unknown signature with custom format' '
        cat >expect <<-\EOF &&
        E
-       61092E85B7227189
+       65A0EEA02E30CAD7
+
+
 
        EOF
-       GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS" 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
 '
 
@@ -215,8 +223,10 @@ test_expect_success GPG 'show lack of signature with custom format' '
        N
 
 
+
+
        EOF
-       git log -1 --format="%G?%n%GK%n%GS" seventh-unsigned >actual &&
+       git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
        test_cmp expect actual
 '
 
@@ -234,4 +244,32 @@ test_expect_success GPG 'check config gpg.format values' '
        test_must_fail git commit -S --amend -m "fail"
 '
 
+test_expect_success GPG 'detect fudged commit with double signature' '
+       sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
+       sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
+               sed -e "s/^gpgsig//;s/^ //" | gpg --dearmor >double-sig1.sig &&
+       gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
+       cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
+       sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/gpgsig /;2,\$s/^/ /" \
+               double-combined.asc > double-gpgsig &&
+       sed -e "/committer/r double-gpgsig" double-base >double-commit &&
+       git hash-object -w -t commit double-commit >double-commit.commit &&
+       test_must_fail git verify-commit $(cat double-commit.commit) &&
+       git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
+       grep "BAD signature from" double-actual &&
+       grep "Good signature from" double-actual
+'
+
+test_expect_success GPG 'show double signature with custom format' '
+       cat >expect <<-\EOF &&
+       E
+
+
+
+
+       EOF
+       git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+       test_cmp expect actual
+'
+
 test_done