George Vanburgh <george@xxxxxxxxxxx> writes: > From: George Vanburgh <gvanburgh@xxxxxxxxxxxxx> > > When running git-p4 on Windows, with multiple git-p4.mapUser entries in > git config - no user mappings are applied to the generated repository. > ... > Using splitlines solves this issue, by splitting config on all > typical delimiters ('\n', '\r\n' etc.) Luke, Lars, this version seems to be in line with the conclusion of your earlier reviews, e.g. <CAE5ih7_+Vc9oqKdjo8h2vgZPup4pto9wd=sBb=W6hCs4tuW2Jg@xxxxxxxxxxxxxx> Even though it looks OK to my eyes, I'll wait for Acks or further refinement suggestions from either of you two before acting on this patch. Thanks. > Signed-off-by: George Vanburgh <gvanburgh@xxxxxxxxxxxxx> > --- > git-p4.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-p4.py b/git-p4.py > index f427bf6..b66f68b 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -656,7 +656,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] > > -- > https://github.com/git/git/pull/319