Merge branch 'gv/mingw-p4-mapuser'
"git p4" did not work well with multiple git-p4.mapUser entries on Windows. * gv/mingw-p4-mapuser: git-p4: fix git-p4.mapUser on Windows
This commit is contained in:
commit
a482cf446f
@ -674,7 +674,7 @@ def gitConfigInt(key):
|
|||||||
def gitConfigList(key):
|
def gitConfigList(key):
|
||||||
if not _gitConfig.has_key(key):
|
if not _gitConfig.has_key(key):
|
||||||
s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
|
s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
|
||||||
_gitConfig[key] = s.strip().split(os.linesep)
|
_gitConfig[key] = s.strip().splitlines()
|
||||||
if _gitConfig[key] == ['']:
|
if _gitConfig[key] == ['']:
|
||||||
_gitConfig[key] = []
|
_gitConfig[key] = []
|
||||||
return _gitConfig[key]
|
return _gitConfig[key]
|
||||||
|
Loading…
Reference in New Issue
Block a user