3 test_description
='merge signature verification tests'
5 .
"$TEST_DIRECTORY/lib-gpg.sh"
7 test_expect_success GPG
'create signed commits' '
8 echo 1 >file && git add file &&
9 test_tick && git commit -m initial &&
12 git checkout -b side-signed &&
13 echo 3 >elif && git add elif &&
14 test_tick && git commit -S -m "signed on side" &&
15 git checkout initial &&
17 git checkout -b side-unsigned &&
18 echo 3 >foo && git add foo &&
19 test_tick && git commit -m "unsigned on side" &&
20 git checkout initial &&
22 git checkout -b side-bad &&
23 echo 3 >bar && git add bar &&
24 test_tick && git commit -S -m "bad on side" &&
25 git cat-file commit side-bad >raw &&
26 sed -e "s/^bad/forged bad/" raw >forged &&
27 git hash-object -w -t commit forged >forged.commit &&
28 git checkout initial &&
30 git checkout -b side-untrusted &&
31 echo 3 >baz && git add baz &&
32 test_tick && git commit -SB7227189 -m "untrusted on side" &&
37 test_expect_success GPG
'merge unsigned commit with verification' '
38 test_when_finished "git reset --hard && git checkout initial" &&
39 test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
40 test_i18ngrep "does not have a GPG signature" mergeerror
43 test_expect_success GPG
'merge unsigned commit with merge.verifySignatures=true' '
44 test_when_finished "git reset --hard && git checkout initial" &&
45 test_config merge.verifySignatures true &&
46 test_must_fail git merge --ff-only side-unsigned 2>mergeerror &&
47 test_i18ngrep "does not have a GPG signature" mergeerror
50 test_expect_success GPG
'merge commit with bad signature with verification' '
51 test_when_finished "git reset --hard && git checkout initial" &&
52 test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
53 test_i18ngrep "has a bad GPG signature" mergeerror
56 test_expect_success GPG
'merge commit with bad signature with merge.verifySignatures=true' '
57 test_when_finished "git reset --hard && git checkout initial" &&
58 test_config merge.verifySignatures true &&
59 test_must_fail git merge --ff-only $(cat forged.commit) 2>mergeerror &&
60 test_i18ngrep "has a bad GPG signature" mergeerror
63 test_expect_success GPG
'merge commit with untrusted signature with verification' '
64 test_when_finished "git reset --hard && git checkout initial" &&
65 test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
66 test_i18ngrep "has an untrusted GPG signature" mergeerror
69 test_expect_success GPG
'merge commit with untrusted signature with verification and high minTrustLevel' '
70 test_when_finished "git reset --hard && git checkout initial" &&
71 test_config gpg.minTrustLevel marginal &&
72 test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
73 test_i18ngrep "has an untrusted GPG signature" mergeerror
76 test_expect_success GPG
'merge commit with untrusted signature with verification and low minTrustLevel' '
77 test_when_finished "git reset --hard && git checkout initial" &&
78 test_config gpg.minTrustLevel undefined &&
79 git merge --ff-only --verify-signatures side-untrusted >mergeoutput &&
80 test_i18ngrep "has a good GPG signature" mergeoutput
83 test_expect_success GPG
'merge commit with untrusted signature with merge.verifySignatures=true' '
84 test_when_finished "git reset --hard && git checkout initial" &&
85 test_config merge.verifySignatures true &&
86 test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
87 test_i18ngrep "has an untrusted GPG signature" mergeerror
90 test_expect_success GPG
'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' '
91 test_when_finished "git reset --hard && git checkout initial" &&
92 test_config merge.verifySignatures true &&
93 test_config gpg.minTrustLevel marginal &&
94 test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
95 test_i18ngrep "has an untrusted GPG signature" mergeerror
98 test_expect_success GPG
'merge signed commit with verification' '
99 test_when_finished "git reset --hard && git checkout initial" &&
100 git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
101 test_i18ngrep "has a good GPG signature" mergeoutput
104 test_expect_success GPG
'merge signed commit with merge.verifySignatures=true' '
105 test_when_finished "git reset --hard && git checkout initial" &&
106 test_config merge.verifySignatures true &&
107 git merge --verbose --ff-only side-signed >mergeoutput &&
108 test_i18ngrep "has a good GPG signature" mergeoutput
111 test_expect_success GPG
'merge commit with bad signature without verification' '
112 test_when_finished "git reset --hard && git checkout initial" &&
113 git merge $(cat forged.commit)
116 test_expect_success GPG
'merge commit with bad signature with merge.verifySignatures=false' '
117 test_when_finished "git reset --hard && git checkout initial" &&
118 test_config merge.verifySignatures false &&
119 git merge $(cat forged.commit)
122 test_expect_success GPG
'merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures' '
123 test_when_finished "git reset --hard && git checkout initial" &&
124 test_config merge.verifySignatures true &&
125 git merge --no-verify-signatures $(cat forged.commit)
128 test_expect_success GPG
'merge unsigned commit into unborn branch' '
129 test_when_finished "git checkout initial" &&
130 git checkout --orphan unborn &&
131 test_must_fail git merge --verify-signatures side-unsigned 2>mergeerror &&
132 test_i18ngrep "does not have a GPG signature" mergeerror