Merge branch 'js/gpg-errors'

[thirdparty/git.git] / t / t7510-signed-commit.sh

diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index bc7a31ba3e7fc4c0611c23f60470fcb392cdd424..48f86cb3678140ba1b0f914da8ebb442abd754b8 100755 (executable)
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -387,4 +387,48 @@ test_expect_success GPG 'verify-commit verifies multiply signed commits' '
        ! grep "BAD signature from" actual
 '
 
+test_expect_success 'custom `gpg.program`' '
+       write_script fake-gpg <<-\EOF &&
+       args="$*"
+
+       # skip uninteresting options
+       while case "$1" in
+       --status-fd=*|--keyid-format=*) ;; # skip
+       *) break;;
+       esac; do shift; done
+
+       case "$1" in
+       -bsau)
+               test -z "$LET_GPG_PROGRAM_FAIL" || {
+                       echo "zOMG signing failed!" >&2
+                       exit 1
+               }
+               cat >sign.file
+               echo "[GNUPG:] SIG_CREATED $args" >&2
+               echo "-----BEGIN PGP MESSAGE-----"
+               echo "$args"
+               echo "-----END PGP MESSAGE-----"
+               ;;
+       --verify)
+               cat "$2" >verify.file
+               exit 0
+               ;;
+       *)
+               echo "Unhandled args: $*" >&2
+               exit 1
+               ;;
+       esac
+       EOF
+
+       test_config gpg.program "$(pwd)/fake-gpg" &&
+       git commit -S --allow-empty -m signed-commit &&
+       test_path_exists sign.file &&
+       git show --show-signature &&
+       test_path_exists verify.file &&
+
+       test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
+       git commit -S --allow-empty -m must-fail 2>err &&
+       grep zOMG err
+'
+
 test_done