fetch: pass --ipv4 and --ipv6 options to sub-fetches

ar-cetitec · gitster · commit 4e735c13267e · 2020-09-15T14:15:05.000-07:00
The options indicate user intent for the whole fetch operation, and
ignoring them in sub-fetches (i.e. "--all" and recursive fetching of
submodules) is quite unexpected when, for instance, it is intended
to limit all of the communication to a specific transport protocol
for some reason.

Signed-off-by: Alex Riesen &lt;alexander.riesen@cetitec.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -1531,6 +1531,10 @@ static void add_options_to_argv(struct argv_array *argv)
 		argv_array_push(argv, "-v");
 	else if (verbosity < 0)
 		argv_array_push(argv, "-q");
+	if (family == TRANSPORT_FAMILY_IPV4)
+		argv_array_push(argv, "--ipv4");
+	else if (family == TRANSPORT_FAMILY_IPV6)
+		argv_array_push(argv, "--ipv6");
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1531,6 +1531,10 @@ static void add_options_to_argv(struct argv_array *argv)`
`1531`	`1531`	`argv_array_push(argv, "-v");`
`1532`	`1532`	`else if (verbosity < 0)`
`1533`	`1533`	`argv_array_push(argv, "-q");`
	`1534`	`+ if (family == TRANSPORT_FAMILY_IPV4)`
	`1535`	`+ argv_array_push(argv, "--ipv4");`
	`1536`	`+ else if (family == TRANSPORT_FAMILY_IPV6)`
	`1537`	`+ argv_array_push(argv, "--ipv6");`
`1534`	`1538`
`1535`	`1539`	`}`
`1536`	`1540`