| Index: gclient_scm.py | 
| diff --git a/gclient_scm.py b/gclient_scm.py | 
| index 07ca6b8f571518b0f860468d24a5650a99c1d0eb..2f3a3a5b279696cb64a4761b9082b2f8e84ca102 100644 | 
| --- a/gclient_scm.py | 
| +++ b/gclient_scm.py | 
| @@ -22,6 +22,7 @@ import git_cache | 
| import scm | 
| import shutil | 
| import subprocess2 | 
| +import subprocess42 | 
|  | 
|  | 
| THIS_FILE_PATH = os.path.abspath(__file__) | 
| @@ -826,7 +827,8 @@ class GitWrapper(SCMWrapper): | 
| if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], | 
| cwd=self.checkout_path): | 
| self._Fetch(options) | 
| -          except subprocess2.CalledProcessError: | 
| +          except (subprocess2.CalledProcessError, | 
| +                  subprocess42.CalledProcessError): | 
| logging.debug('git config --get svn-remote.svn.fetch failed, ' | 
| 'ignoring possible optimization.') | 
| if options.verbose: | 
| @@ -1213,7 +1215,7 @@ class GitWrapper(SCMWrapper): | 
| elif quiet: | 
| fetch_cmd.append('--quiet') | 
| self._Run(fetch_cmd, options, show_header=options.verbose, retry=True, | 
| -              kill_timeout=kill_timeout) | 
| +              kill_timeout=kill_timeout, use_v42=True) | 
|  | 
| # Return the revision that was fetched; this will be stored in 'FETCH_HEAD' | 
| return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD']) | 
| @@ -1248,7 +1250,10 @@ class GitWrapper(SCMWrapper): | 
| if show_header: | 
| gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs) | 
| else: | 
| -      gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs) | 
| +      if kwargs.pop('use_v42', False): | 
| +        gclient_utils.CheckCallAndFilter42(cmd, env=env, **kwargs) | 
| +      else: | 
| +        gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs) | 
|  | 
|  | 
| class SVNWrapper(SCMWrapper): | 
|  |