Merge branch 'nd/n18n-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2018 07:28:39 +0000 (16:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2018 07:28:39 +0000 (16:28 +0900)
* nd/n18n-fix:
transport-helper.c: do not translate a string twice

1  2 
transport-helper.c
diff --combined transport-helper.c
index 7213fa0d320284e318c7895cc0915ef556ac4f6d,7bd16c4be3fd25292f17eececa7ec21ad1effd72..bf225c698fac81a9a94eff6d3371988ac4ff0bac
@@@ -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,