diff options
author | Yang Zhao <yang.zhao@skyboxlabs.com> | 2019-12-14 00:52:42 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-15 21:53:40 +0100 |
commit | 50da1e73933386ef95499d2f7753184ba82ce2b3 (patch) | |
tree | 01fe61077866d825df2e87a8a1b9f3a64a15cbaa /git-p4.py | |
parent | git-p4: open .gitp4-usercache.txt in text mode (diff) | |
download | git-50da1e73933386ef95499d2f7753184ba82ce2b3.tar.xz git-50da1e73933386ef95499d2f7753184ba82ce2b3.zip |
git-p4: use marshal format version 2 when sending to p4
p4 does not appear to understand marshal format version 3 and above.
Version 2 was the latest supported by python-2.7.
Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Reviewed-by: Ben Keene <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1679,7 +1679,8 @@ class P4Submit(Command, P4UserMap): c = changes[0] if c['User'] == newUser: return # nothing to do c['User'] = newUser - input = marshal.dumps(c) + # p4 does not understand format version 3 and above + input = marshal.dumps(c, 2) result = p4CmdList("change -f -i", stdin=input) for r in result: |