summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-26 22:55:07 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-26 22:55:08 -0700
commit614ea03a71e6b5281d7fce9f073c091772145047 (patch)
treedfe5f0632a92d2da1d0457dc8e5824ef8f065829 /builtin/commit.c
parent2adb614902ca4dbf085b880ee5bcfea8c2dafb08 (diff)
parent557a5998df19faf8641acfc5b6b1c3c2ba64dca9 (diff)
downloadgit-614ea03a71e6b5281d7fce9f073c091772145047.tar.gz
Merge branch 'bw/submodule-config-cleanup'
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
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index b79bcfd5b9..b3b04f5dd3 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -195,7 +195,6 @@ static void determine_whence(struct wt_status *s)
static void status_init_config(struct wt_status *s, config_fn_t fn)
{
wt_status_prepare(s);
- gitmodules_config();
git_config(fn, s);
determine_whence(s);
init_diff_ui_defaults();