Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/transport-helper.c b/transport-helper.c
index a6bff8b30811c649c82afcdc9e018af1a34ce13c..b934183236ca571093f55818f5018c278150e274 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -321,6 +321,21 @@ static void standard_options(struct transport *t)
        if (n >= sizeof(buf))
                die("impossibly large verbosity value");
        set_helper_option(t, "verbosity", buf);
+
+       switch (t->family) {
+       case TRANSPORT_FAMILY_ALL:
+               /*
+                * this is already the default,
+                * do not break old remote helpers by setting "all" here
+                */
+               break;
+       case TRANSPORT_FAMILY_IPV4:
+               set_helper_option(t, "family", "ipv4");
+               break;
+       case TRANSPORT_FAMILY_IPV6:
+               set_helper_option(t, "family", "ipv6");
+               break;
+       }
 }
 
 static int release_helper(struct transport *transport)