summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-11-04 04:33:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-04 04:33:05 (GMT)
commitc32ca691c282fb34eeb29639340a2aa15f861606 (patch)
tree47984c708bd5bf8b2de5bff2bc9582211938da12
parentab6b50e4c8339167c0b048c778055526226c45ca (diff)
parentc7aadccba01579d8ab23e662b3b64bc6cc2980a7 (diff)
downloadgit-c32ca691c282fb34eeb29639340a2aa15f861606.zip
git-c32ca691c282fb34eeb29639340a2aa15f861606.tar.gz
git-c32ca691c282fb34eeb29639340a2aa15f861606.tar.bz2
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
-rw-r--r--builtin/fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 0c345b5..863c858 100644
--- 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);