Merge branch 'jt/delay-fetch-if-missing'

gitster · gitster · commit c32ca691c282 · 2019-11-04T13:33:05.000+09:00
Work-around a lazy fetch glitch.

* jt/delay-fetch-if-missing:
  fetch: delay fetch_if_missing=0 until after config
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -1755,8 +1755,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
 	packet_trace_identity("fetch");
 
-	fetch_if_missing = 0;
-
 	/* Record the command line for the reflog */
 	strbuf_addstr(&default_rla, "fetch");
 	for (i = 1; i < argc; i++)
@@ -1824,6 +1822,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		}
 	}
 
+	fetch_if_missing = 0;
+
 	if (remote) {
 		if (filter_options.choice || has_promisor_remote())
 			fetch_one_setup_partial(remote);

Original file line number	Diff line number	Diff line change
`@@ -1755,8 +1755,6 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`1755`	`1755`
`1756`	`1756`	`packet_trace_identity("fetch");`
`1757`	`1757`
`1758`		`- fetch_if_missing = 0;`
`1759`		`-`
`1760`	`1758`	`/* Record the command line for the reflog */`
`1761`	`1759`	`strbuf_addstr(&default_rla, "fetch");`
`1762`	`1760`	`for (i = 1; i < argc; i++)`
`@@ -1824,6 +1822,8 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`1824`	`1822`	`}`
`1825`	`1823`	`}`
`1826`	`1824`
	`1825`	`+ fetch_if_missing = 0;`
	`1826`	`+`
`1827`	`1827`	`if (remote) {`
`1828`	`1828`	`if (filter_options.choice \|\| has_promisor_remote())`
`1829`	`1829`	`fetch_one_setup_partial(remote);`