Merge branch 'nb/worktree-api-doc'

diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 180f0be9149ffa2e5fed83172a782e57229cff24..19ccae28699da7949af3203cde62ac648c7effb4 100755 (executable)
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -175,8 +175,9 @@ test_expect_success GPG 'show good signature with custom format' '
        G
        13B6F51ECDDE430D
        C O Mitter <committer@example.com>
+       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" sixth-signed >actual &&
        test_cmp expect actual
 '
 
@@ -185,8 +186,9 @@ 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" $(cat forged1.commit) >actual &&
        test_cmp expect actual
 '
 
@@ -195,8 +197,9 @@ test_expect_success GPG 'show untrusted signature with custom format' '
        U
        61092E85B7227189
        Eris Discordia <discord@example.net>
+       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" eighth-signed-alt >actual &&
        test_cmp expect actual
 '
 
@@ -205,8 +208,9 @@ test_expect_success GPG 'show unknown signature with custom format' '
        E
        61092E85B7227189
 
+
        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" eighth-signed-alt >actual &&
        test_cmp expect actual
 '
 
@@ -215,8 +219,9 @@ 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" seventh-unsigned >actual &&
        test_cmp expect actual
 '
 
@@ -255,8 +260,9 @@ test_expect_success GPG 'show double signature with custom format' '
        E
 
 
+
        EOF
-       git log -1 --format="%G?%n%GK%n%GS" $(cat double-commit.commit) >actual &&
+       git log -1 --format="%G?%n%GK%n%GS%n%GF" $(cat double-commit.commit) >actual &&
        test_cmp expect actual
 '