| Index: gclient_scm.py
|
| ===================================================================
|
| --- gclient_scm.py (revision 143717)
|
| +++ gclient_scm.py (working copy)
|
| @@ -200,10 +200,14 @@
|
| 'git', 'config', '-f', '$toplevel/.git/config',
|
| 'submodule.$name.ignore', 'all']
|
| cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
|
| + cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
|
| try:
|
| gclient_utils.CheckCallAndFilter(
|
| cmd, cwd=self.checkout_path, print_stdout=False,
|
| filter_fn=lambda x: None)
|
| + gclient_utils.CheckCallAndFilter(
|
| + cmd2, cwd=self.checkout_path, print_stdout=False,
|
| + filter_fn=lambda x: None)
|
| except subprocess2.CalledProcessError:
|
| # Not a fatal error, or even very interesting in a non-git-submodule
|
| # world. So just keep it quiet.
|
|
|