summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-08-03 11:19:55 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-03 13:11:01 -0700
commit078b75e99be00155eac3ec2d4eaa0ae0941ff54d (patch)
treee01e723d92f256309940c15c46fb15ec3fb03b3c /diff.c
parent2cc67fe54a029842e71e49a676bf010e988d4063 (diff)
downloadgit-078b75e99be00155eac3ec2d4eaa0ae0941ff54d.tar.gz
diff: stop allowing diff to have submodules configured in .git/config
Traditionally a submodule is comprised of a gitlink as well as a corresponding entry in the .gitmodules file. Diff doesn't follow this paradigm as its config callback routine falls back to populating the submodule-config if a config entry starts with 'submodule.'. Remove this behavior in order to be consistent with how the submodule-config is populated, via calling 'gitmodules_config()' or 'repo_read_gitmodules()'. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 85e714f6c6..e43519b885 100644
--- a/diff.c
+++ b/diff.c
@@ -346,9 +346,6 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
return 0;
}
- if (starts_with(var, "submodule."))
- return parse_submodule_config_option(var, value);
-
if (git_diff_heuristic_config(var, value, cb) < 0)
return -1;