summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-22 19:36:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-22 19:36:34 (GMT)
commit6854689e65700b361eb5d7ff3d4af01bd3e650fe (patch)
tree8f449a1965a1913f0771b0bca5dc92a82b43ff53 /builtin/fetch.c
parent31b94541708af19bc5083b24ba176081b4e8a130 (diff)
parent4e735c13267e65f8c37fc3e7dfaacb36e5d51ab8 (diff)
downloadgit-6854689e65700b361eb5d7ff3d4af01bd3e650fe.zip
git-6854689e65700b361eb5d7ff3d4af01bd3e650fe.tar.gz
git-6854689e65700b361eb5d7ff3d4af01bd3e650fe.tar.bz2
Merge branch 'ar/fetch-ipversion-in-all'
"git fetch --all --ipv4/--ipv6" forgot to pass the protocol options to instances of the "git fetch" that talk to individual remotes, which has been corrected. * ar/fetch-ipversion-in-all: fetch: pass --ipv4 and --ipv6 options to sub-fetches
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 76a4d14..1b00c2b 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1552,7 +1552,10 @@ static void add_options_to_argv(struct strvec *argv)
strvec_push(argv, "-v");
else if (verbosity < 0)
strvec_push(argv, "-q");
-
+ if (family == TRANSPORT_FAMILY_IPV4)
+ strvec_push(argv, "--ipv4");
+ else if (family == TRANSPORT_FAMILY_IPV6)
+ strvec_push(argv, "--ipv6");
}
/* Fetch multiple remotes in parallel */