t7510: test verify-commit
This mixes the "git verify-commit" tests in with the "git show --show-signature" tests, to keep the tests more readable. The tests already mix in the "call show" tests with the "verify" tests. So in case of a test beakage, a '-v' run would be needed to reveal the exact point of breakage anyway. Additionally, test the actual output of "git verify-commit" and "git show --show-signature" and compare to "git cat-file". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Jun 23, 2014 at 09:05 UTC
8e92c2cf37038a3b3bb82724f018e4d0ab1180ff
1 file changed
+19
-1
t/t7510-signed-commit.sh
+19
-1
@@ -45,10 +45,11 @@ test_expect_success GPG 'create signed commits' '
45
git tag seventh-signed
46
'
47
48
-test_expect_success GPG 'show signatures' '
48
+test_expect_success GPG 'verify and show signatures' '
49
(
50
for commit in initial second merge fourth-signed fifth-signed sixth-signed master
51
do
52
+ git verify-commit $commit &&
53
git show --pretty=short --show-signature $commit >actual &&
54
grep "Good signature from" actual &&
55
! grep "BAD signature from" actual || exit 1
@@ -58,6 +59,7 @@ test_expect_success GPG 'show signatures' '
59
(
60
for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
61
do
62
+ test_must_fail git verify-commit $commit &&
63
git show --pretty=short --show-signature $commit >actual &&
64
! grep "Good signature from" actual &&
65
! grep "BAD signature from" actual || exit 1
@@ -66,11 +68,25 @@ test_expect_success GPG 'show signatures' '
68
)
69
'
70
71
+test_expect_success GPG 'show signed commit with signature' '
72
+ git show -s initial >commit &&
73
+ git show -s --show-signature initial >show &&
74
+ git verify-commit -v initial >verify.1 2>verify.2 &&
75
+ git cat-file commit initial >cat &&
76
+ grep -v "gpg: " show >show.commit &&
77
+ grep "gpg: " show >show.gpg &&
78
+ grep -v "^ " cat | grep -v "^gpgsig " >cat.commit &&
79
+ test_cmp show.commit commit &&
80
+ test_cmp show.gpg verify.2 &&
81
+ test_cmp cat.commit verify.1
82
+'
83
+
84
test_expect_success GPG 'detect fudged signature' '
85
git cat-file commit master >raw &&
86
87
sed -e "s/seventh/7th forged/" raw >forged1 &&
88
git hash-object -w -t commit forged1 >forged1.commit &&
89
+ ! git verify-commit $(cat forged1.commit) &&
90
git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
91
grep "BAD signature from" actual1 &&
92
! grep "Good signature from" actual1
@@ -81,6 +97,7 @@ test_expect_success GPG 'detect fudged signature with NUL' '
97
cat raw >forged2 &&
98
echo Qwik | tr "Q" "\000" >>forged2 &&
99
git hash-object -w -t commit forged2 >forged2.commit &&
100
+ ! git verify-commit $(cat forged2.commit) &&
101
git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
102
grep "BAD signature from" actual2 &&
103
! grep "Good signature from" actual2
@@ -89,6 +106,7 @@ test_expect_success GPG 'detect fudged signature with NUL' '
106
test_expect_success GPG 'amending already signed commit' '
107
git checkout fourth-signed^0 &&
108
git commit --amend -S --no-edit &&
109
+ git verify-commit HEAD &&
110
git show -s --show-signature HEAD >actual &&
111
grep "Good signature from" actual &&
112
! grep "BAD signature from" actual