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 <redacted>
Reviewed-by: Ben Keene <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-p4.py b/git-p4.py
index abcda60eee01e1a5047fea83854ca2b447b69470..c7170c9ae69e7c880358888ba054fb68068b83c4 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -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: