[Libreoffice-commits] core.git: g

[Stephan Bergmann]

 g |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 3a33d9ce82566387337faa3e7983a2aca39f3b1f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 12 16:56:30 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/g b/g
index 49ece9ff6880..13bc73939e49 100755
--- a/g
+++ b/g
@@ -90,14 +90,6 @@ local hook
     for repo in ${SUBMODULES_ALL?} ; do
         refresh_submodule_hooks "$repo"
     done
-    # 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
-    done
     popd > /dev/null
 
 }