Merge branch 'ms/core-icase-doc'

diff --git a/transport.h b/transport.h
index e2c809af4d96fc94b1e47cbcd0ef36d6b07a18b8..7792b08582c132e18b495a21b700d9113727c7eb 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -71,6 +71,12 @@ struct transport {
         */
        const struct string_list *push_options;
 
+       /*
+        * These strings will be passed to the remote side on each command
+        * request, if both sides support the server-option capability.
+        */
+       const struct string_list *server_options;
+
        char *pack_lockfile;
        signed verbose : 3;
        /**
@@ -227,8 +233,6 @@ int transport_helper_init(struct transport *transport, const char *name);
 int bidirectional_transfer_loop(int input, int output);
 
 /* common methods used by transport.c and builtin/send-pack.c */
-void transport_verify_remote_names(int nr_heads, const char **heads);
-
 void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);
 
 int transport_refs_pushed(struct ref *ref);