Commit 628522eb authored by mmoss@chromium.org's avatar mmoss@chromium.org

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

This causes the 'git config' to only add or update the branch-heads fetch
entry, and not replace any other existing entry (e.g. refs/heads/*).

Review URL: https://chromiumcodereview.appspot.com/12634013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@189326 0039d316-1c4b-4281-b951-d872f2087c98
parent df31e61e
...@@ -703,7 +703,8 @@ class GitWrapper(SCMWrapper): ...@@ -703,7 +703,8 @@ class GitWrapper(SCMWrapper):
# revert'). # revert').
if hasattr(options, 'with_branch_heads') and options.with_branch_heads: if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
config_cmd = ['config', 'remote.origin.fetch', 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) self._Run(config_cmd, options)
# Update the "branch-heads" remote-tracking branches, since we might # Update the "branch-heads" remote-tracking branches, since we might
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment