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

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/*).

[rohitrao (ping after 24h), 2013-03-20 15:52:41]

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py#newcode707
gclient_scm.py:707: '^\+refs/branch-heads/\*:.*$']
Where will the initial "branch-heads" entry come from after this patch goes in? 
This line used to add it, but now it will only change existing "branch-heads"
entries.

[M-A Ruel, 2013-03-20 15:55:24]

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py#newcode707
gclient_scm.py:707: '^\+refs/branch-heads/\*:.*$']
'^\\+refs/branch-heads/\\*:.*$'
?

[Michael Moss, 2013-03-20 15:59:38]

This will cause it to add if there is no match, and change the existing
entry if there is. You can test this yourself with something like:

git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
cd depot_tools
git config --get-all remote.origin.fetch
# just refs/heads
git config remote.origin.fetch
+refs/branch-heads/*:refs/remotes/branch-heads/*
'^\+refs/branch-heads/\*:.*$'
git config --get-all remote.origin.fetch
# shows refs/heads and refs/branch-heads
git config remote.origin.fetch
+refs/branch-heads/*:refs/remotes/branch-heads/*
'^\+refs/branch-heads/\*:.*$'
git config --get-all remote.origin.fetch
# still just one branch-heads



On Wed, Mar 20, 2013 at 8:52 AM, <rohitrao@chromium.org> wrote:

>
>
https://codereview.chromium.**org/12634013/diff/1/gclient_**scm.py<https://co...
> File gclient_scm.py (right):
>
> https://codereview.chromium.**org/12634013/diff/1/gclient_**
>
scm.py#newcode707<https://codereview.chromium.org/12634013/diff/1/gclient_scm.py#newcode707>
> gclient_scm.py:707: '^\+refs/branch-heads/\*:.*$']
> Where will the initial "branch-heads" entry come from after this patch
> goes in?  This line used to add it, but now it will only change existing
> "branch-heads" entries.
>
>
https://codereview.chromium.**org/12634013/<https://codereview.chromium.org/1...
>

[Michael Moss, 2013-03-20 16:01:11]

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py#newcode707
gclient_scm.py:707: '^\+refs/branch-heads/\*:.*$']
On 2013/03/20 15:55:24, Marc-Antoine Ruel wrote:
> '^\\+refs/branch-heads/\\*:.*$'
> ?

I tested this manually and it worked for me as-is.

[Michael Moss, 2013-03-20 16:23:49]

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/12634013/diff/1/gclient_scm.py#newcode707
gclient_scm.py:707: '^\+refs/branch-heads/\*:.*$']
On 2013/03/20 16:01:11, Michael Moss wrote:
> On 2013/03/20 15:55:24, Marc-Antoine Ruel wrote:
> > '^\\+refs/branch-heads/\\*:.*$'
> > ?
> 
> I tested this manually and it worked for me as-is.

Actually, I tested both ways and it still works. Maybe we're doing some
automatic command scrubbing somewhere? If you like it better with the
double-slashes, I'll keep that.

[M-A Ruel, 2013-03-20 17:04:08]

On 2013/03/20 16:23:49, Michael Moss wrote:
> Actually, I tested both ways and it still works. Maybe we're doing some
> automatic command scrubbing somewhere? If you like it better with the
> double-slashes, I'll keep that.

It's because '\+' == '\\+' in python, because there's no escape code for +, it
just assumes it was missing an escape of \ itself. Similar to bash. It's still
preferable to properly escape the \ themselves.

lgtm

[commit-bot: I haz the power, 2013-03-20 17:19:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mmoss@chromium.org/12634013/6001

[commit-bot: I haz the power, 2013-03-20 17:22:00]

Change committed as 189326