Merge branch 'nd/n18n-fix'

gitster · gitster · commit 9ec8af6c9e91 · 2018-11-29T16:28:39.000+09:00
* nd/n18n-fix:
  transport-helper.c: do not translate a string twice
diff --git a/transport-helper.c b/transport-helper.c
@@ -573,7 +573,7 @@ static int run_connect(struct transport *transport, struct strbuf *cmdbuf)
 			fprintf(stderr, "Debug: Falling back to dumb "
 				"transport.\n");
 	} else {
-		die(_(_("unknown response to connect: %s")),
+		die(_("unknown response to connect: %s"),
 		    cmdbuf->buf);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ static int run_connect(struct transport transport, struct strbuf cmdbuf)`
`573`	`573`	`fprintf(stderr, "Debug: Falling back to dumb "`
`574`	`574`	`"transport.\n");`
`575`	`575`	`} else {`
`576`		`- die(_(_("unknown response to connect: %s")),`
	`576`	`+ die(_("unknown response to connect: %s"),`
`577`	`577`	`cmdbuf->buf);`
`578`	`578`	`}`
`579`	`579`