From: Junio C Hamano Date: Wed, 18 Feb 2015 19:45:03 +0000 (-0800) Subject: Merge branch 'jc/push-cert' X-Git-Tag: v2.4.0-rc0~106 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/74f45dfd78661a84fcff81e616ef6c154deadcb9?hp=ca00db08da414b3f6bd9481a51fdbb4b6836719c Merge branch 'jc/push-cert' "git push --signed" gave an incorrectly worded error message when the other side did not support the capability. * jc/push-cert: transport-helper: fix typo in error message when --signed is not supported --- diff --git a/transport-helper.c b/transport-helper.c index 27c82f73ac..7441d5d515 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -863,7 +863,7 @@ static int push_refs_with_export(struct transport *transport, die("helper %s does not support dry-run", data->name); } else if (flags & TRANSPORT_PUSH_CERT) { if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "true") != 0) - die("helper %s does not support dry-run", data->name); + die("helper %s does not support --signed", data->name); } if (flags & TRANSPORT_PUSH_FORCE) {