From: Junio C Hamano Date: Thu, 24 Aug 2017 18:19:51 +0000 (-0700) Subject: Merge branch 'bw/submodule-config-cleanup' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e35d58c4c61aac9275acb46d523db85fd28e5412 Merge branch 'bw/submodule-config-cleanup' into next Code clean-up to avoid mixing values read from the .gitmodules file and values read from the .git/config file. * bw/submodule-config-cleanup: submodule: remove gitmodules_config unpack-trees: improve loading of .gitmodules submodule-config: lazy-load a repository's .gitmodules file submodule-config: move submodule-config functions to submodule-config.c submodule-config: remove support for overlaying repository config diff: stop allowing diff to have submodules configured in .git/config submodule: remove submodule_config callback routine unpack-trees: don't respect submodule.update submodule: don't rely on overlayed config when setting diffopts fetch: don't overlay config with submodule-config submodule--helper: don't overlay config in update-clone submodule--helper: don't overlay config in remote_submodule_branch add, reset: ensure submodules can be added or reset submodule: don't use submodule_from_name t7411: check configuration parsing errors --- e35d58c4c61aac9275acb46d523db85fd28e5412 diff --cc unpack-trees.c index 78590f1bfa,3c7f464fae..68d34259c6 --- a/unpack-trees.c +++ b/unpack-trees.c @@@ -377,9 -367,8 +366,9 @@@ static int check_updates(struct unpack_ remove_scheduled_dirs(); if (should_update_submodules() && o->update && !o->dry_run) - reload_gitmodules_file(index, &state); + load_gitmodules_file(index, &state); + enable_delayed_checkout(&state); for (i = 0; i < index->cache_nr; i++) { struct cache_entry *ce = index->cache[i];