Make gclient fetch git repos recursively. This is needed when adding a git repo through DEPS. If th…

gclient_scm.py

Index: gclient_scm.py
===================================================================
--- gclient_scm.py	(revision 188763)
+++ gclient_scm.py	(working copy)
@@ -201,21 +201,23 @@
                   'submodule.$name.ignore', 'all']
     cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
     cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
-    cmd3 = ['git', 'config', 'branch.autosetupmerge']
+    cmd3 = ['git', 'config', 'diff.recurseSubmodules', 'true']
+    cmd4 = ['git', 'config', 'branch.autosetupmerge']
     kwargs = {'cwd': self.checkout_path,
               'print_stdout': False,
               'filter_fn': lambda x: None}
     try:
       gclient_utils.CheckCallAndFilter(cmd, **kwargs)
       gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd3, **kwargs)

[szager1, 2013/03/18 22:04:46]

I think this should be outside the try/except clause.  If it fails, the error
should be surfaced.  Unlike the other commands, if it fails, you could wind up
with a bad state in your checkout.

[jam, 2013/03/18 22:10:24]

Done.

     except subprocess2.CalledProcessError:
       # Not a fatal error, or even very interesting in a non-git-submodule
       # world.  So just keep it quiet.
       pass
     try:
-      gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
     except subprocess2.CalledProcessError:
-      gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd4 + ['always'], **kwargs)
 
   def update(self, options, args, file_list):
     """Runs git to update or transparently checkout the working copy.
@@ -656,6 +658,7 @@
     if options.verbose:
       clone_cmd.append('--verbose')
     clone_cmd.extend([url, self.checkout_path])
+    clone_cmd.append('--recursive')
 
     # If the parent directory does not exist, Git clone on Windows will not
     # create it, so we need to do it manually.