From 6ede85ff7b9945ae2b1b839a154cca71ee52a3ce Mon Sep 17 00:00:00 2001 From: "iannucci@chromium.org" Date: Thu, 4 Apr 2013 07:57:17 +0000 Subject: [PATCH] Revert "Make gclient fetch git repos recursively. This is needed when adding a git repo through DEPS. If that repo has submodules, we need to fetch them or else the repo won't be complete." This reverts commit 6a2e4710bf3bbde9ab3f8c5ce44f7e9cd1fb3036. cmp says: This CL causes NewGit and Git submodules workflows to comingle in ways that result in bad and unexpected failures for new and existing users. One failure is for the new Blink developers who need to use git-svn with their WebKit third_party checkout. Another failure is in the Windows NewGit workflow where gclient sync takes longer than necessary to complete. The right approach at this point given the costs of this change is to revert it and rethink the best way to get projects the functionality they need while restoring the functionality existing projects have required for over a year now. Please discuss the recursive/recurseSubmodules code face-to-face with cmp@google.com before attempting to make this live again. Thanks. R=cmp@chromium.org BUG=224074 Review URL: https://chromiumcodereview.appspot.com/13470027 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192236 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gclient_scm.py b/gclient_scm.py index 37a8bee50..9facab6d9 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -202,7 +202,6 @@ class GitWrapper(SCMWrapper): cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)] cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all'] cmd3 = ['git', 'config', 'branch.autosetupmerge'] - cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'true'] kwargs = {'cwd': self.checkout_path, 'print_stdout': False, 'filter_fn': lambda x: None} @@ -218,8 +217,6 @@ class GitWrapper(SCMWrapper): except subprocess2.CalledProcessError: gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs) - gclient_utils.CheckCallAndFilter(cmd4, **kwargs) - def update(self, options, args, file_list): """Runs git to update or transparently checkout the working copy. @@ -659,7 +656,6 @@ class GitWrapper(SCMWrapper): 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.