Sebastian Götte | efed002 | 2013-03-31 18:02:24 +0200 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='merge signature verification tests' |
| 4 | . ./test-lib.sh |
| 5 | . "$TEST_DIRECTORY/lib-gpg.sh" |
| 6 | |
| 7 | test_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 | |
Sebastian Götte | eb307ae | 2013-03-31 18:02:46 +0200 | [diff] [blame] | 30 | git checkout -b side-untrusted && |
| 31 | echo 3 >baz && git add baz && |
Jeff King | 99094a7 | 2015-03-20 06:07:15 -0400 | [diff] [blame] | 32 | test_tick && git commit -SB7227189 -m "untrusted on side" && |
Sebastian Götte | eb307ae | 2013-03-31 18:02:46 +0200 | [diff] [blame] | 33 | |
Sebastian Götte | efed002 | 2013-03-31 18:02:24 +0200 | [diff] [blame] | 34 | git checkout master |
| 35 | ' |
| 36 | |
| 37 | test_expect_success GPG 'merge unsigned commit with verification' ' |
| 38 | test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror && |
| 39 | test_i18ngrep "does not have a GPG signature" mergeerror |
| 40 | ' |
| 41 | |
| 42 | test_expect_success GPG 'merge commit with bad signature with verification' ' |
| 43 | test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror && |
| 44 | test_i18ngrep "has a bad GPG signature" mergeerror |
| 45 | ' |
| 46 | |
Sebastian Götte | eb307ae | 2013-03-31 18:02:46 +0200 | [diff] [blame] | 47 | test_expect_success GPG 'merge commit with untrusted signature with verification' ' |
| 48 | test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror && |
| 49 | test_i18ngrep "has an untrusted GPG signature" mergeerror |
| 50 | ' |
| 51 | |
Sebastian Götte | efed002 | 2013-03-31 18:02:24 +0200 | [diff] [blame] | 52 | test_expect_success GPG 'merge signed commit with verification' ' |
| 53 | git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput && |
| 54 | test_i18ngrep "has a good GPG signature" mergeoutput |
| 55 | ' |
| 56 | |
| 57 | test_expect_success GPG 'merge commit with bad signature without verification' ' |
| 58 | git merge $(cat forged.commit) |
| 59 | ' |
| 60 | |
| 61 | test_done |