From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Feb 2016 21:25:54 +0000 (-0800)
Subject: Merge branch 'ew/force-ipv4'
X-Git-Tag: v2.8.0-rc0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e84d5e9fa178a027b1c8b9f6e22c9173dcda03b3;p=thirdparty%2Fgit.git

Merge branch 'ew/force-ipv4'

"git fetch" and friends that make network connections can now be
told to only use ipv4 (or ipv6).

* ew/force-ipv4:
  connect & http: support -4 and -6 switches for remote operations
---

e84d5e9fa178a027b1c8b9f6e22c9173dcda03b3
diff --cc builtin/fetch.c
index 8e742135f0,89b71a8f85..55919a9e4f
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -37,7 -37,7 +37,8 @@@ static int prune = -1; /* unspecified *
  static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
  static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
  static int tags = TAGS_DEFAULT, unshallow, update_shallow;
 +static int max_children = 1;
+ static enum transport_family family;
  static const char *depth;
  static const char *upload_pack;
  static struct strbuf default_rla = STRBUF_INIT;