diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-12 16:56:30 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-12 20:38:49 +0100 |
commit | 3a33d9ce82566387337faa3e7983a2aca39f3b1f (patch) | |
tree | 3dc1e5471d9193cfd4ac204d658d1979a7b5ee22 /embeddedobj | |
parent | 5a891dde0df4b01e100f3742e24a2f2d147c2690 (diff) |
Revert "g: ignore submodule changes"
This reverts commit 27925032cd5aec8805185679e01c687c40bbd617.
Conflicts:
g
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/51155
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'embeddedobj')
0 files changed, 0 insertions, 0 deletions