Kaydet (Commit) 3a33d9ce authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Miklos Vajna

Revert "g: ignore submodule changes"

This reverts commit 27925032.

According to vmiklos, that commit was meant to help with the following scenario:
Assume a dev uses submodules and uses plain `git pull && git submodule update`
instead of ./g.  When they forget the "&& git submodule update" part and do
`git commit -a`, changes to the submodules were excluded from the commit.

However, when they do `git add -u && git commit` instead of `git commit -a`,
changes to the submodules /are/ included in the commit, despite `git status` or
`git diff` (both prior to `git add -u`) or `git diff --cached` (after `git add
-u`) not indicating that there are any changes to the submodules.  I consider
that problem more confusing and severe than the problem that the commit solved.

Change-Id: I595eed3c1c04efd108be1ccd792d8d7bce72a345
Reviewed-on: https://gerrit.libreoffice.org/51155Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 5a891dde
......@@ -90,14 +90,6 @@ local hook
for repo in ${SUBMODULES_ALL?} ; do
refresh_submodule_hooks "$repo"
# In our workflow, it's always gerrit that does the submodule updates, so
# better ignoring them to avoid accidentally including those changes in our
# commits.
# 'git submodule status' can be still used to see if a submodule has such
# changes.
for repo in ${SUBMODULES_CONFIGURED?} ; do
git config submodule."$repo".ignore all
popd > /dev/null
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment