From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Nov 2018 07:28:39 +0000 (+0900)
Subject: Merge branch 'nd/n18n-fix'
X-Git-Tag: v2.20.0-rc2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ec8af6c9e91443dd7178421ff1bc993282db94b?ds=inline;hp=-c

Merge branch 'nd/n18n-fix'

* nd/n18n-fix:
transport-helper.c: do not translate a string twice
---

9ec8af6c9e91443dd7178421ff1bc993282db94b
diff --combined transport-helper.c
index 7213fa0d32,7bd16c4be3..bf225c698f
--- a/transport-helper.c
+++ b/transport-helper.c
@@@ -573,7 -573,7 +573,7 @@@ static int run_connect(struct transpor
  			fprintf(stderr, "Debug: Falling back to dumb "
  				"transport.\n");
  	} else {
- 		die(_(_("unknown response to connect: %s")),
+ 		die(_("unknown response to connect: %s"),
  		    cmdbuf->buf);
  	}
  
@@@ -684,9 -684,6 +684,9 @@@ static int fetch(struct transport *tran
  			transport, "filter",
  			data->transport_options.filter_options.filter_spec);
  
 +	if (data->transport_options.negotiation_tips)
 +		warning("Ignoring --negotiation-tip because the protocol does not support it.");
 +
  	if (data->fetch)
  		return fetch_with_fetch(transport, nr_heads, to_fetch);
  
@@@ -1105,7 -1102,6 +1105,7 @@@ static struct ref *get_refs_list(struc
  }
  
  static struct transport_vtable vtable = {
 +	0,
  	set_helper_option,
  	get_refs_list,
  	fetch,