summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-11-04 13:11:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-04 20:13:46 (GMT)
commit72549dfd5d33424fbf557b0078503687780a3a53 (patch)
treec09c33551f6107a25bee4b512f87a51081952980 /builtin/fetch.c
parent76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff)
downloadgit-72549dfd5d33424fbf557b0078503687780a3a53.zip
git-72549dfd5d33424fbf557b0078503687780a3a53.tar.gz
git-72549dfd5d33424fbf557b0078503687780a3a53.tar.bz2
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to load all config, but our callback only processes the fetch.prune option; we do not chain to git_default_config at all. This means that we may not load some core configuration which will have an effect. For instance, we do not load core.logAllRefUpdates, which impacts whether or not we create reflogs in a bare repository. Note that I said "may" above. It gets even more exciting. If we have to transfer actual objects as part of the fetch, then we call fetch_pack as part of the same process. That function loads its own config, which does chain to git_default_config, impacting global variables which are used by the rest of fetch. But if the fetch is a pure ref update (e.g., a new ref which is a copy of an old one), we skip fetch_pack entirely. So we get inconsistent results depending on whether or not we have actual objects to transfer or not! Let's just load the core config at the start of fetch, so we know we have it (we may also load it again as part of fetch_pack, but that's OK; it's designed to be idempotent). Our tests check both cases (with and without a pack). We also check similar behavior for push for good measure, but it already works as expected. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 55f457c..36f386d 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -66,7 +66,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
fetch_prune_config = git_config_bool(k, v);
return 0;
}
- return 0;
+ return git_default_config(k, v, cb);
}
static struct option builtin_fetch_options[] = {