t / t7612-merge-verify-signatures.shon commit merge: detect delete/modechange conflict (72fac66)
   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 -b side-untrusted &&
  31        echo 3 >baz && git add baz &&
  32        test_tick && git commit -SB7227189 -m "untrusted on side"
  33
  34        git checkout master
  35'
  36
  37test_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
  42test_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
  47test_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
  52test_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
  57test_expect_success GPG 'merge commit with bad signature without verification' '
  58        git merge $(cat forged.commit)
  59'
  60
  61test_done