Don't replace default fetch config with branch-heads.

gclient_scm.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 685 matching lines @@
     for _ in range(3):
       try:
         # Add the "branch-heads" refspecs. Do this separately from the clone
         # command since apparently some versions of git don't support 'clone
         # --config'.
         # Don't assume 'with_branch_heads' is added by 'gclient sync' setup,
         # since _Clone() can by reached in roundabout ways (e.g. 'gclient
         # revert').
         if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
           config_cmd = ['config', 'remote.origin.fetch',
-                        '+refs/branch-heads/*:refs/remotes/branch-heads/*']
+                        '+refs/branch-heads/*:refs/remotes/branch-heads/*',
+                        '^\\+refs/branch-heads/\\*:.*$']
           self._Run(config_cmd, options)
 
           # Update the "branch-heads" remote-tracking branches, since we might
           # need it to checkout a specific revision below.
           fetch_cmd = ['fetch', 'origin']
           if options.verbose:
             fetch_cmd.append('--verbose')
           self._Run(fetch_cmd, options)
         break
       except subprocess2.CalledProcessError, e:
@@ skipping 537 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command