Merge branch 'jc/push-cert' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:12:58 +0000 (13:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:12:58 +0000 (13:12 -0800)
"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

transport-helper.c
index 3b90ebadb907de4f5f20177de560211d1e770ed6..7dc4a443aee0c6220dc0581d4bcfdd1d65da1d8a 100644 (file)
@@ -862,7 +862,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) {