6ccfbf367aa2b52e9fdb42ade6b23b0292171715
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 &&
26 sed -e "s/bad/forged bad/" raw >forged &&
27 git hash-object -w -t commit forged >forged.commit &&
28 git checkout initial &&
29
30 git checkout master
31'
32
33test_expect_success GPG 'merge unsigned commit with verification' '
34 test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
35 test_i18ngrep "does not have a GPG signature" mergeerror
36'
37
38test_expect_success GPG 'merge commit with bad signature with verification' '
39 test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
40 test_i18ngrep "has a bad GPG signature" mergeerror
41'
42
43test_expect_success GPG 'merge signed commit with verification' '
44 git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
45 test_i18ngrep "has a good GPG signature" mergeoutput
46'
47
48test_expect_success GPG 'merge commit with bad signature without verification' '
49 git merge $(cat forged.commit)
50'
51
52test_done