Sergey Sharybin
aab707ab70
The meaning of the ignore option for submodules did change since our initial Git setup was done: back then it was affecting both diff and stage families of Git command. Unfortunately, the actual behavior did violate what documentation was stating (the documentation was stating that the option only affects diff family of commands). This got fixed in Git some time after our initial setup and it was the behavior of the commands changed, not the documentation. This lead to a situation when we can no longer see that submodules are modified and staged, and it is very easy to stage the submodules. For the clarity: diff and status are both "status" family, show and diff are "diff" family. Hence this change: since there is no built-in zero-configuration way of forbidding Git from staging submodules lets make it visible and clear what the state of submodules is. We still need to inform people to not stage submodules, for which we can offer some configuration tips and scripts but doing so is outside of the scope of this change at it requires some additional research. Current goal is simple: make it visible and clear what is going to be committed to Git. This is a response to an increased frequency of incidents when the submodules are getting modified and committed without authors even noticing this (which is also a bit annoying to recover from). Differential Revision: https://developer.blender.org/D13001
17 lines
465 B
Plaintext
17 lines
465 B
Plaintext
[submodule "release/scripts/addons"]
|
|
path = release/scripts/addons
|
|
url = ../blender-addons.git
|
|
branch = main
|
|
[submodule "release/scripts/addons_contrib"]
|
|
path = release/scripts/addons_contrib
|
|
url = ../blender-addons-contrib.git
|
|
branch = main
|
|
[submodule "release/datafiles/locale"]
|
|
path = release/datafiles/locale
|
|
url = ../blender-translations.git
|
|
branch = main
|
|
[submodule "source/tools"]
|
|
path = source/tools
|
|
url = ../blender-dev-tools.git
|
|
branch = main
|