summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorYang Zhao <yang.zhao@skyboxlabs.com>2019-12-13 23:52:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-15 20:53:40 (GMT)
commit50da1e73933386ef95499d2f7753184ba82ce2b3 (patch)
tree01fe61077866d825df2e87a8a1b9f3a64a15cbaa /git-p4.py
parent5a5577d808668a7859c5009ddfa18b097368ba2c (diff)
downloadgit-50da1e73933386ef95499d2f7753184ba82ce2b3.zip
git-50da1e73933386ef95499d2f7753184ba82ce2b3.tar.gz
git-50da1e73933386ef95499d2f7753184ba82ce2b3.tar.bz2
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-xgit-p4.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index abcda60..c7170c9 100755
--- 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: