Merge branch 'jc/push-cert'

gitster · gitster · commit 74f45dfd7866 · 2015-02-18T11:45:03.000-08:00
"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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@ static int push_refs_with_export(struct transport *transport,`
`863`	`863`	`die("helper %s does not support dry-run", data->name);`
`864`	`864`	`} else if (flags & TRANSPORT_PUSH_CERT) {`
`865`	`865`	`if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "true") != 0)`
`866`		`- die("helper %s does not support dry-run", data->name);`
	`866`	`+ die("helper %s does not support --signed", data->name);`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`if (flags & TRANSPORT_PUSH_FORCE) {`