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

Work-around a lazy fetch glitch.

* jt/delay-fetch-if-missing:
  fetch: delay fetch_if_missing=0 until after config
This commit is contained in:
Junio C Hamano 2019-11-04 13:33:05 +09:00
commit c32ca691c2

View File

@ -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);