aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-02 13:36:55 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-02 13:36:55 -0800
commita482cf446f2ced7fdd67faa2b3a55bfd5caf7d58 (patch)
tree4df5673a3157e6ecaa610bb4f50371684c86e4a8 /git-p4.py
parent6f1c08bdb75b37ad30103f0f12339780fdc004e2 (diff)
parentc3c2b057767c037b32a276e14bf563383ce82e39 (diff)
downloadgit-a482cf446f2ced7fdd67faa2b3a55bfd5caf7d58.tar.gz
git-a482cf446f2ced7fdd67faa2b3a55bfd5caf7d58.tar.xz
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 7bda915bd..9695d2ed3 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -674,7 +674,7 @@ def gitConfigInt(key):
def gitConfigList(key):
if not _gitConfig.has_key(key):
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] == ['']:
_gitConfig[key] = []
return _gitConfig[key]