diff --git a/gclient.py b/gclient.py index 4a5ccb0026..cc072e85c7 100755 --- a/gclient.py +++ b/gclient.py @@ -1330,10 +1330,7 @@ it or fix the checkout. if cache_dir: cache_dir = os.path.join(self.root_dir, cache_dir) cache_dir = os.path.abspath(cache_dir) - # If running on a bot, force break any stale git cache locks. - if os.path.exists(cache_dir) and os.environ.get('CHROME_HEADLESS'): - subprocess2.check_call(['git', 'cache', 'unlock', '--cache-dir', - cache_dir, '--force', '--all']) + gclient_scm.GitWrapper.cache_dir = cache_dir git_cache.Mirror.SetCachePath(cache_dir)