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>
Yang Zhao committed
Dec 13, 2019 at 15:52 UTC
50da1e73933386ef95499d2f7753184ba82ce2b3
1 file changed
+2
-1
git-p4.py
+2
-1
@@ -1679,7 +1679,8 @@ class P4Submit(Command, P4UserMap):
1679
c = changes[0]
1680
if c['User'] == newUser: return # nothing to do
1681
c['User'] = newUser
1682
- input = marshal.dumps(c)
1682
+ # p4 does not understand format version 3 and above
1683
+ input = marshal.dumps(c, 2)
1684
1685
result = p4CmdList("change -f -i", stdin=input)
1686
for r in result: