Always ignore submodules.

gclient_scm.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import collections
 import logging
 import os
 import posixpath
@@ skipping 237 matching lines @@
     its upstream branch.
     """
     merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
     gclient_utils.CheckCallAndFilter(
         ['git', 'diff', merge_base],
         cwd=self.checkout_path,
         filter_fn=GitDiffFilterer(self.relpath).Filter)
 
   def UpdateSubmoduleConfig(self):
     submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
-                  'submodule.$name.ignore', '||',
-                  'git', 'config', '-f', '$toplevel/.git/config',
                   'submodule.$name.ignore', 'all']

[Paweł Hajdan Jr., 2014/01/16 17:20:35]

Ah, I missed there is still submodule.$name here.

     cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]

[Paweł Hajdan Jr., 2014/01/16 03:20:06]

Do we still need the git submodule foreach then?

I admit I don't know git submodules that well. Just asking to understand.

[szager1, 2014/01/16 05:44:52]

Yes, we do; the submodule foreach command is the thing that sets the 'ignore'
config.

     cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
     cmd3 = ['git', 'config', 'branch.autosetupmerge']
     cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
     kwargs = {'cwd': self.checkout_path,
               'print_stdout': False,
               'filter_fn': lambda x: None}
     try:
       gclient_utils.CheckCallAndFilter(cmd, **kwargs)
       gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
     except subprocess2.CalledProcessError:
@@ skipping 1246 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command