Message ID | ead90d343b1f4f4ce8998b2f31558fd30d7d2675.1676440714.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | ad6b320756d8d9150291c696a02c86d1c2f0f4b2 |
Headers | show |
Series | Make GPG errors less puzzling | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > ret |= !cp; > + if (ret) { > + error(_("gpg failed to sign the data:\n%s"), > + gpg_status.len ? gpg_status.buf : "(no gpg output)"); > + strbuf_release(&gpg_status); > + return -1; > + } > strbuf_release(&gpg_status); > - if (ret) > - return error(_("gpg failed to sign the data")); Good. As we are worried about error messages that are too terse, dumping everything to the output would be a vast improvement. Hopefully gpg_status.len would to be thousands of bytes long, and this is not a codepath that is triggered remotely anyway. Will queue. Thanks.
diff --git a/gpg-interface.c b/gpg-interface.c index 687236430bf..5cd66d3a786 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -977,9 +977,13 @@ static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, break; /* found */ } ret |= !cp; + if (ret) { + error(_("gpg failed to sign the data:\n%s"), + gpg_status.len ? gpg_status.buf : "(no gpg output)"); + strbuf_release(&gpg_status); + return -1; + } strbuf_release(&gpg_status); - if (ret) - return error(_("gpg failed to sign the data")); /* Strip CR from the line endings, in case we are on Windows. */ remove_cr_after(signature, bottom); diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index ec07c8550f5..48f86cb3678 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -399,6 +399,10 @@ test_expect_success 'custom `gpg.program`' ' 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-----" @@ -420,7 +424,11 @@ test_expect_success 'custom `gpg.program`' ' git commit -S --allow-empty -m signed-commit && test_path_exists sign.file && git show --show-signature && - test_path_exists verify.file + 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