| Index: git_cache.py
|
| diff --git a/git_cache.py b/git_cache.py
|
| index 9e3eaec9fd2a67a3d0988954da03a6fd6200c94f..e80923cdbb074a0c27355bd51041341fd473ed27 100755
|
| --- a/git_cache.py
|
| +++ b/git_cache.py
|
| @@ -219,26 +219,23 @@
|
| def config(self, cwd=None):
|
| if cwd is None:
|
| cwd = self.mirror_path
|
| - env = os.environ.copy()
|
| - env['GIT_DIR'] = cwd
|
|
|
| # Don't run git-gc in a daemon. Bad things can happen if it gets killed.
|
| - self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd, env=env)
|
| + self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd)
|
|
|
| # Don't combine pack files into one big pack file. It's really slow for
|
| # repositories, and there's no way to track progress and make sure it's
|
| # not stuck.
|
| - self.RunGit(['config', 'gc.autopacklimit', '0'], cwd=cwd, env=env)
|
| + self.RunGit(['config', 'gc.autopacklimit', '0'], cwd=cwd)
|
|
|
| # Allocate more RAM for cache-ing delta chains, for better performance
|
| # of "Resolving deltas".
|
| self.RunGit(['config', 'core.deltaBaseCacheLimit',
|
| - gclient_utils.DefaultDeltaBaseCacheLimit()], cwd=cwd, env=env)
|
| -
|
| - self.RunGit(['config', 'remote.origin.url', self.url], cwd=cwd, env=env)
|
| + gclient_utils.DefaultDeltaBaseCacheLimit()], cwd=cwd)
|
| +
|
| + self.RunGit(['config', 'remote.origin.url', self.url], cwd=cwd)
|
| self.RunGit(['config', '--replace-all', 'remote.origin.fetch',
|
| - '+refs/heads/*:refs/heads/*', r'\+refs/heads/\*:.*'],
|
| - cwd=cwd, env=env)
|
| + '+refs/heads/*:refs/heads/*', r'\+refs/heads/\*:.*'], cwd=cwd)
|
| for ref in self.refs:
|
| ref = ref.lstrip('+').rstrip('/')
|
| if ref.startswith('refs/'):
|
| @@ -249,7 +246,7 @@
|
| regex = r'\+refs/heads/%s:.*' % ref.replace('*', r'\*')
|
| self.RunGit(
|
| ['config', '--replace-all', 'remote.origin.fetch', refspec, regex],
|
| - cwd=cwd, env=env)
|
| + cwd=cwd)
|
|
|
| def bootstrap_repo(self, directory):
|
| """Bootstrap the repo from Google Stroage if possible.
|
|
|