| Index: git_cl.py
|
| diff --git a/git_cl.py b/git_cl.py
|
| index 72770a145e4194197b910b7c0eb7db5cb2469e08..3c51377f61d722d46091d2ea40030b479534eef3 100755
|
| --- a/git_cl.py
|
| +++ b/git_cl.py
|
| @@ -327,9 +327,13 @@ class Settings(object):
|
| def GetIsGitSvn(self):
|
| """Return true if this repo looks like it's using git-svn."""
|
| if self.is_git_svn is None:
|
| - # If you have any "svn-remote.*" config keys, we think you're using svn.
|
| - self.is_git_svn = RunGitWithCode(
|
| - ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
|
| + # The presence of a svn-remote using the svn:// (or file://)
|
| + # protocol suggests that you're using svn. Remotes with the
|
| + # http* protocols suggest read-only svn access and are ignored.
|
| + code, result = RunGitWithCode(
|
| + ['config', '--local', '--get-regexp', r'^svn-remote\..*\.url'])
|
| + self.is_git_svn = (code == 0 and ("svn://" in result or
|
| + "file://" in result))
|
| return self.is_git_svn
|
|
|
| def GetSVNBranch(self):
|
|
|