]> git.ipfire.org Git - thirdparty/git.git/blame - t/t7612-merge-verify-signatures.sh
The sixth batch
[thirdparty/git.git] / t / t7612-merge-verify-signatures.sh
CommitLineData
efed0022
SG
1#!/bin/sh
2
3test_description='merge signature verification tests'
4. ./test-lib.sh
5. "$TEST_DIRECTORY/lib-gpg.sh"
6
7test_expect_success GPG 'create signed commits' '
8 echo 1 >file && git add file &&
9 test_tick && git commit -m initial &&
10 git tag initial &&
11
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 &&
16
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 &&
21
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 &&
2f3cbcd8 26 sed -e "s/^bad/forged bad/" raw >forged &&
efed0022
SG
27 git hash-object -w -t commit forged >forged.commit &&
28 git checkout initial &&
29
eb307ae7
SG
30 git checkout -b side-untrusted &&
31 echo 3 >baz && git add baz &&
99094a7a 32 test_tick && git commit -SB7227189 -m "untrusted on side" &&
eb307ae7 33
efed0022
SG
34 git checkout master
35'
36
37test_expect_success GPG 'merge unsigned commit with verification' '
fb2afea3 38 test_when_finished "git reset --hard && git checkout initial" &&
efed0022
SG
39 test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
40 test_i18ngrep "does not have a GPG signature" mergeerror
41'
42
ca779e82 43test_expect_success GPG 'merge unsigned commit with merge.verifySignatures=true' '
fb2afea3 44 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
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
48'
49
efed0022 50test_expect_success GPG 'merge commit with bad signature with verification' '
fb2afea3 51 test_when_finished "git reset --hard && git checkout initial" &&
efed0022
SG
52 test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
53 test_i18ngrep "has a bad GPG signature" mergeerror
54'
55
ca779e82 56test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true' '
fb2afea3 57 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
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
61'
62
eb307ae7 63test_expect_success GPG 'merge commit with untrusted signature with verification' '
fb2afea3 64 test_when_finished "git reset --hard && git checkout initial" &&
eb307ae7
SG
65 test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
66 test_i18ngrep "has an untrusted GPG signature" mergeerror
67'
68
54887b46
HJI
69test_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
74'
75
76test_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
81'
82
ca779e82 83test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
fb2afea3 84 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
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
88'
89
54887b46
HJI
90test_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
96'
97
efed0022 98test_expect_success GPG 'merge signed commit with verification' '
fb2afea3 99 test_when_finished "git reset --hard && git checkout initial" &&
efed0022
SG
100 git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
101 test_i18ngrep "has a good GPG signature" mergeoutput
102'
103
ca779e82 104test_expect_success GPG 'merge signed commit with merge.verifySignatures=true' '
fb2afea3 105 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
106 test_config merge.verifySignatures true &&
107 git merge --verbose --ff-only side-signed >mergeoutput &&
108 test_i18ngrep "has a good GPG signature" mergeoutput
109'
110
efed0022 111test_expect_success GPG 'merge commit with bad signature without verification' '
fb2afea3 112 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
113 git merge $(cat forged.commit)
114'
115
116test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=false' '
fb2afea3 117 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82 118 test_config merge.verifySignatures false &&
efed0022
SG
119 git merge $(cat forged.commit)
120'
121
ca779e82 122test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures' '
fb2afea3 123 test_when_finished "git reset --hard && git checkout initial" &&
ca779e82
HJI
124 test_config merge.verifySignatures true &&
125 git merge --no-verify-signatures $(cat forged.commit)
126'
127
7488ba3e
JK
128test_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
133'
134
efed0022 135test_done