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>

Jeff King committed Nov 4, 2014 at 08:11 UTC 72549dfd5d33424fbf557b0078503687780a3a53
2 files changed +41 -1
builtin/fetch.c
+1 -1
@@ -66,7 +66,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
66 fetch_prune_config = git_config_bool(k, v);
67 return 0;
68 }
69 - return 0;
69 + return git_default_config(k, v, cb);
70 }
71
72 static struct option builtin_fetch_options[] = {
t/t5516-fetch-push.sh
+40
@@ -11,6 +11,7 @@ This test checks the following functionality:
11 * hooks
12 * --porcelain output format
13 * hiderefs
14 +* reflogs
15 '
16
17 . ./test-lib.sh
@@ -1277,4 +1278,43 @@ EOF
1278 git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
1279 '
1280
1281 +test_expect_success 'push into bare respects core.logallrefupdates' '
1282 + rm -rf dst.git &&
1283 + git init --bare dst.git &&
1284 + git -C dst.git config core.logallrefupdates true &&
1285 +
1286 + # double push to test both with and without
1287 + # the actual pack transfer
1288 + git push dst.git master:one &&
1289 + echo "one@{0} push" >expect &&
1290 + git -C dst.git log -g --format="%gd %gs" one >actual &&
1291 + test_cmp expect actual &&
1292 +
1293 + git push dst.git master:two &&
1294 + echo "two@{0} push" >expect &&
1295 + git -C dst.git log -g --format="%gd %gs" two >actual &&
1296 + test_cmp expect actual
1297 +'
1298 +
1299 +test_expect_success 'fetch into bare respects core.logallrefupdates' '
1300 + rm -rf dst.git &&
1301 + git init --bare dst.git &&
1302 + (
1303 + cd dst.git &&
1304 + git config core.logallrefupdates true &&
1305 +
1306 + # as above, we double-fetch to test both
1307 + # with and without pack transfer
1308 + git fetch .. master:one &&
1309 + echo "one@{0} fetch .. master:one: storing head" >expect &&
1310 + git log -g --format="%gd %gs" one >actual &&
1311 + test_cmp expect actual &&
1312 +
1313 + git fetch .. master:two &&
1314 + echo "two@{0} fetch .. master:two: storing head" >expect &&
1315 + git log -g --format="%gd %gs" two >actual &&
1316 + test_cmp expect actual
1317 + )
1318 +'
1319 +
1320 test_done