Chromium Code Reviews| Index: gclient_scm.py |
| diff --git a/gclient_scm.py b/gclient_scm.py |
| index 67d68674e04fd5f0c42084529551a1fa35c181f5..93463952cfc14f74b6bf79e46e3d198594ef7d15 100644 |
| --- a/gclient_scm.py |
| +++ b/gclient_scm.py |
| @@ -308,6 +308,15 @@ class GitWrapper(SCMWrapper): |
| files = self._Capture(['ls-files']).splitlines() |
| file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| + def _DisableHooks(self): |
| + hook_dir = os.path.join(self.checkout_path, '.git', 'hooks') |
| + if not os.path.isdir(hook_dir): |
| + return |
| + for f in os.listdir(hook_dir): |
| + if not f.endswith('.sample') and not f.endswith('.disabled'): |
| + os.rename(os.path.join(hook_dir, f), |
| + os.path.join(hook_dir, f + '.disabled')) |
| + |
| def update(self, options, args, file_list): |
| """Runs git to update or transparently checkout the working copy. |
| @@ -321,6 +330,8 @@ class GitWrapper(SCMWrapper): |
| self._CheckMinVersion("1.6.6") |
| + self._DisableHooks() |
|
iannucci
2014/06/19 23:31:42
Will this still run for unmanaged repos? If so, do
szager1
2014/06/20 00:49:39
I changed it to only run on managed repos.
|
| + |
| # If a dependency is not pinned, track the default remote branch. |
| default_rev = 'refs/remotes/%s/master' % self.remote |
| url, deps_revision = gclient_utils.SplitUrlRevision(self.url) |
| @@ -796,11 +807,8 @@ class GitWrapper(SCMWrapper): |
| # git clone doesn't seem to insert a newline properly before printing |
| # to stdout |
| self.Print('') |
| - template_path = os.path.join( |
| - os.path.dirname(THIS_FILE_PATH), 'git-templates') |
| cfg = gclient_utils.DefaultIndexPackConfig(url) |
| - clone_cmd = cfg + [ |
| - 'clone', '--no-checkout', '--progress', '--template=%s' % template_path] |
| + clone_cmd = cfg + ['clone', '--no-checkout', '--progress'] |
| if self.cache_dir: |
| clone_cmd.append('--shared') |
| if options.verbose: |