Chromium Code Reviews| Index: gclient_scm.py |
| diff --git a/gclient_scm.py b/gclient_scm.py |
| index 9ccc76f217059810e41f3fd66e30affd7ff4727e..18bc0e389653cfab2ec2fc1443a963c1887c5cb0 100644 |
| --- a/gclient_scm.py |
| +++ b/gclient_scm.py |
| @@ -318,7 +318,8 @@ class GitWrapper(SCMWrapper): |
| current_url = self._Capture(['config', 'remote.origin.url']) |
| # TODO(maruel): Delete url != 'git://foo' since it's just to make the |
| # unit test pass. (and update the comment above) |
| - if current_url != url and url != 'git://foo': |
| + if (current_url != url and url != 'git://foo' and |
| + self._Capture(['config', 'remote.origin.gclient']) != 'getoffmylawn'): |
|
szym
2013/05/22 00:01:48
If the url is different and remote.origin.gclient
|
| print('_____ switching %s to a new upstream' % self.relpath) |
| # Make sure it's clean |
| self._CheckClean(rev_str) |