summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-05-26 12:10:13 -0700
committerJunio C Hamano <gitster@pobox.com>2017-05-30 14:28:54 +0900
commit1d789d089280539ca39b83aabb67860929d39b75 (patch)
treee3d77202b1f199be4ce57a3f19c8a390aa192b4a /xdiff-interface.h
parentd7a3803f9e83242adac0f02af843ef0520c71f0a (diff)
downloadgit-1d789d089280539ca39b83aabb67860929d39b75.tar.gz
submodule loading: separate code path for .gitmodules and config overlay
The .gitmodules file is not supposed to have all the options available, that are available in the configuration so separate it out. A configuration option such as the hypothetical submodule.color.diff that determines in which color a submodule change is printed, is a very user specific thing, that the .gitmodules file should not tamper with. The .gitmodules file should only be used for settings that required to setup the project in which the .gitmodules file is tracked. As the minimum this would only include the name<->path mapping of the submodule and its URL and branch. Any further setting (such as 'fetch.recursesubmodules' or 'submodule.<name>.{update, ignore, shallow}') is not specific to the project setup requirements, but rather is a distribution of suggested developer configurations. In other areas of Git a suggested developer configuration is not transported in-tree but via other means. In an organisation this could be done by deploying an opinionated system wide config (/etc/gitconfig) or by putting the settings in the users home directory when they start at the organisation. In open source projects this is often accomplished via extensive READMEs (cf. our SubmittingPatches/CodingGuidlines). As a later patch in this series wants to introduce a generic submodule recursion option, we want to make sure that switch is not exposed via the gitmodules file. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions