From 628522eb8d1009e18853dfb416638bb2adadcd6c Mon Sep 17 00:00:00 2001 From: "mmoss@chromium.org" Date: Wed, 20 Mar 2013 17:21:59 +0000 Subject: [PATCH] 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 --- gclient_scm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gclient_scm.py b/gclient_scm.py index 529b7ffd66..37a8bee505 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -703,7 +703,8 @@ class GitWrapper(SCMWrapper): # 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